Skip to content

chore(deps): update cargo_toml for edition 2024 [fix #10412] - #12270

Merged
FabianLars merged 5 commits into
tauri-apps:devfrom
aurelj:cargo_toml
Jan 6, 2025
Merged

chore(deps): update cargo_toml for edition 2024 [fix #10412]#12270
FabianLars merged 5 commits into
tauri-apps:devfrom
aurelj:cargo_toml

Conversation

@aurelj

@aurelj aurelj commented Jan 6, 2025

Copy link
Copy Markdown
Contributor

This is a follow-up on #10414.

It actually replaces from_slice_with_metadata() with from_path_with_metadata() as suggested.
Note that canonicalize() is necessary as from_path_with_metadata() lookup the parent dir in the path to find the workspace, and there is no parent dir in a simple "Cargo.toml" path.

It also updates caro_toml to 0.21, which allows using tauri-build with an edition 2024 Cargo.toml.

@aurelj
aurelj requested a review from a team as a code owner January 6, 2025 11:42
@github-actions

github-actions Bot commented Jan 6, 2025

Copy link
Copy Markdown
Contributor

Package Changes Through af388d9

There are 4 changes which include tauri-build with patch, tauri-cli with patch, @tauri-apps/cli with patch, tauri-driver with patch

Planned Package Versions

The following package releases are the planned based on the context of changes in this pull request.

package current next
tauri-build 2.0.4 2.0.5
tauri 2.2.0 2.2.1
@tauri-apps/cli 2.2.2 2.2.3
tauri-cli 2.2.2 2.2.3
tauri-driver 2.0.1 2.0.2

Add another change file through the GitHub UI by following this link.


Read about change files or the docs at github.com/jbolda/covector

@FabianLars

Copy link
Copy Markdown
Member

thanks so much!

Before i can merge this i need all commits in the PR to be signed. you can sign past commit like this. git rebase --exec 'git commit --amend --no-edit -n -S' -i dev

Also, could you add a changefile for tauri-build as well?

aurelj added 2 commits January 6, 2025 16:04
Note that canonicalize is necessary as from_path_with_metadata lookup
the parent dir in the path.
@aurelj

aurelj commented Jan 6, 2025

Copy link
Copy Markdown
Contributor Author

Before i can merge this i need all commits in the PR to be signed. you can sign past commit like this. git rebase --exec 'git commit --amend --no-edit -n -S' -i dev

Ok, I've signed the commits (not sure of the value of such a signature with a key that I just generated for this purpose, but anyway...)

Also, could you add a changefile for tauri-build as well?

Done. (not sure if I was supposed to make up the 2.0.5 version number or let it blank ?)

@FabianLars

Copy link
Copy Markdown
Member

thanks again :)

@FabianLars FabianLars changed the title update cargo_toml for edition 2024 [fix #10412] chore(deps): update cargo_toml for edition 2024 [fix #10412] Jan 6, 2025
@FabianLars
FabianLars merged commit 848d0e0 into tauri-apps:dev Jan 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants