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

Use cargo 1.64 workspace inheritance feature #3107

Merged
merged 2 commits into from
Oct 20, 2022

Conversation

jinleili
Copy link
Contributor

@jinleili jinleili commented Oct 14, 2022

Checklist

  • Run cargo clippy.
  • Run RUSTFLAGS=--cfg=web_sys_unstable_apis cargo clippy --target wasm32-unknown-unknown if applicable.
  • Add change to CHANGELOG.md. See simple instructions inside file.

Description
Now, dependencies used by more than one package use inheritance instead.

In the [package] table, three fields of name, description, and version remain independent. Although each crate version is now synchronized, they should be able to upgrade the version separately, in dummy, player two crates, the authors value is not the same, so it also remains independent.
- In dummy, player crates, the authors field value are not the same, so they remain independent.
- The value of homepage field is "https://wgpu.rs/" in wgpu crate and "https://github.com/gfx-rs/wgpu" in other crate, I'm not sure if this is intentional or not, but now it is inherited as "https://wgpu.rs/" value

deno_webgpu and cts_runner are not workspace members, so inheritance cannot be used.

Testing
Tested locally on macOS, Windows11 and Android 12.

Copy link
Member

@cwfitzgerald cwfitzgerald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool!

dummy/Cargo.toml Outdated Show resolved Hide resolved
wgpu-core/Cargo.toml Outdated Show resolved Hide resolved
@cwfitzgerald
Copy link
Member

deno_webgpu and cts_runner are not workspace members, so inheritance cannot be used.

#3097 makes them so

I'm not sure if this is intentional or not, but now it is inherited as "wgpu.rs" value

Wasn't intentional

@ErichDonGubler
Copy link
Member

Not a blocker, but I wanted to note that this PR would be a breaking change, because it would change the repo's current MSRV to Rust 1.64, AIUI:

Minimum Supported Rust Version is 1.62. It is enforced on CI (in "/.github/workflows/ci.yml") with RUST_VERSION variable. This version can only be upgraded in breaking releases.

@codecov-commenter
Copy link

codecov-commenter commented Oct 17, 2022

Codecov Report

Merging #3107 (de71278) into master (ce08179) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3107   +/-   ##
=======================================
  Coverage   64.75%   64.75%           
=======================================
  Files          81       81           
  Lines       38711    38711           
=======================================
  Hits        25066    25066           
  Misses      13645    13645           
Impacted Files Coverage Δ
wgpu-hal/src/dx12/descriptor.rs 87.56% <0.00%> (-0.50%) ⬇️
wgpu-hal/src/gles/mod.rs 62.30% <0.00%> (+0.76%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@ErichDonGubler
Copy link
Member

RE: MSRV: shall we also update the MSRV in the README and CI?

@cwfitzgerald
Copy link
Member

@ErichDonGubler any changes in either wgpu or naga going into master can break - we don't really do patch releases outside of major bugs, and when we patch we go into the specific version (eg. v0.14) branch.

Copy link
Member

@cwfitzgerald cwfitzgerald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is totally wacky wild, but I love it!

@cwfitzgerald cwfitzgerald merged commit cc44881 into gfx-rs:master Oct 20, 2022
@jinleili jinleili deleted the cargo1.64 branch October 20, 2022 06:15
@jimblandy jimblandy mentioned this pull request Nov 18, 2022
3 tasks
@jimblandy jimblandy mentioned this pull request Dec 15, 2022
3 tasks
jimblandy added a commit to jimblandy/wgpu that referenced this pull request Dec 15, 2022
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.

4 participants