Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update cargo_toml for edition 2024 [fix #10412] #10414

Draft
wants to merge 4 commits into
base: 1.x
Choose a base branch
from

Conversation

chippers
Copy link
Member

@chippers chippers commented Jul 29, 2024

This upgrade, along with removing an old workspace special case, allows 2024 edition to compile and run (on my m2 pro).

cc @FabianLars is that workspace special case i removed still needed or does the crate updates cover everything?

draft until we know if it bumps msrv and if we need to move down some cargo_toml versions

@chippers chippers changed the base branch from dev to 1.x July 29, 2024 15:53
@tweidinger tweidinger marked this pull request as ready for review July 30, 2024 05:07
@tweidinger tweidinger requested a review from a team as a code owner July 30, 2024 05:07
Copy link
Contributor

Package Changes Through 41f5181

There are 8 changes which include tauri-cli with patch, @tauri-apps/cli with patch, tauri with patch, tauri-bundler with patch, tauri-utils with patch, tauri-build with patch, tauri-runtime with patch, tauri-runtime-wry 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-utils 1.6.0 1.6.1
tauri-bundler 1.6.0 1.6.1
tauri-runtime 0.14.4 0.14.5
tauri-runtime-wry 0.14.9 0.14.10
tauri-codegen 1.4.4 1.4.5
tauri-macros 1.4.5 1.4.6
tauri-build 1.5.3 1.5.4
tauri 1.7.1 1.7.2
@tauri-apps/cli 1.6.0 1.6.1
tauri-cli 1.6.0 1.6.1

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
Member

This made me realize that we don't do msrv checks on tauri-build. cargo_toml 0.15 requires a newer rust version than tauri's msrv. The issue is that the methods i used there for the workspace inheritance were added in 0.15...

cc @FabianLars is that workspace special case i removed still needed or does the crate updates cover everything?

Ignoring what i just said, yes it's still needed unless we replace from_slice_with_metadata with from_path_with_metadata which should handle workspace inheritance automatically. The latter was already part of 0.15 so i wonder what made me opt for the current approach 🤔

@chippers chippers marked this pull request as draft July 30, 2024 13:42
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.

3 participants