Skip to content

Add workspace readme to Cargo.toml - #651

Merged
Firestar99 merged 1 commit into
Rust-GPU:mainfrom
0HyperCube:workspace-readme
Sep 29, 2026
Merged

Firestar99 merged 1 commit into
Rust-GPU:mainfrom
0HyperCube:workspace-readme

Conversation

@0HyperCube

Copy link
Copy Markdown
Contributor

Some of the crates use readme.workspace = true but there is no readme set in the workspace manifest.

This PR corrects this by adding the readme to the workspace.

This may be the cause of the error in the graphite build. In any case it is probably good to clean it up.

@Firestar99

Copy link
Copy Markdown
Member

That probably got introduced in #553 when I merged cargo-gpu into this workspace & repo. I'm surprised to see a failure like this, cause that PR has been merged months ago and noone ever noticed. Is your CI using nightly and maybe the newest nightly starts to fail here?

Also, I'm trying to get a new rust-gpu version out asap, give me another day or so.

@0HyperCube

0HyperCube commented Sep 28, 2026 •

Copy link
Copy Markdown
Contributor Author

The CI was using the v0.10.0-alpha.1 but was moved recently to the nightly (which is when the failure was introduced).

@Firestar99

Firestar99 commented Sep 28, 2026 •

Copy link
Copy Markdown
Member

The weird thing is, cargo +nightly b -p spirv-std on main works, even if it is spanning a bunch of new warnings. Maybe rustc devs noticed this would break a bunch of crates and reverted it already?

$ cargo +nightly --version
cargo 1.101.0-nightly (3d7cf6e93 2026-09-25)

EDIT: I don't mind just merging this, I just would like to know if it actually solves your issue.

@0HyperCube

Copy link
Copy Markdown
Contributor Author

Also, I'm trying to get a new rust-gpu version out asap, give me another day or so.

Thanks; I think this would probably be beneficial to avoid using a git commit (the previous release didn't work with the latest glam version so we chose to temporarily use a git commit).

The weird thing is, cargo +nightly b -p spirv-std on main works, even if it is spanning a bunch of new warnings. Maybe rustc devs noticed this would break a bunch of crates and reverted it already?

Yes it is quite weird; the shader builds work fine in graphite outside of the nix runner. It doesn't appear to matter which version of nightly is pinned (I changed it to fix a later build error). I think perhaps it is some property of nix where it tries to parses all the crates?

I have tested locally and can confirm that this patch does fix the issue.

Thanks for your help reviewing.

@timon-schelling

timon-schelling commented Sep 28, 2026 •

Copy link
Copy Markdown

Can also confirm this works. And the Nix build fails because crane (nix build helper for rust) inlines workspace attributes and is more strict about resolution that than cargo. Will also file this with crane.

EDIT: with this included builds successful again see https://github.com/GraphiteEditor/Graphite/actions/runs/36468782474/job/109085455481

@Firestar99

Copy link
Copy Markdown
Member

I changed it so it's no longer inheriting the readme property, but the two crates using it just define it themselves. Inheriting this properly is weird since it's a path that's always relative to the crate's Cargo.toml, not the workspace's Cargo.toml.

@0HyperCube I see there's another branch called t to debug something? If something's broken in graphite (due to glam updates?) just let me know here or on discord and I'll have a look :D

@Firestar99
Firestar99 disabled auto-merge September 29, 2026 10:01
@Firestar99
Firestar99 added this pull request to the merge queue Sep 29, 2026
@0HyperCube

Copy link
Copy Markdown
Contributor Author

I changed it so it's no longer inheriting the readme property, but the two crates using it just define it themselves. Inheriting this properly is weird since it's a path that's always relative to the crate's Cargo.toml, not the workspace's Cargo.toml.

That is indeed rather strange behaviour.

@0HyperCube I see there's another branch called t to debug something? If something's broken in graphite (due to glam updates?) just let me know here or on discord and I'll have a look :D

This is indeed just a test and can be ignored. The graphite build now works fine with this branch.

Merged via the queue into Rust-GPU:main with commit e53a944 Sep 29, 2026
23 checks passed
description = "Install rust-gpu and it's required toolchain automatically"
repository.workspace = true
readme.workspace = true
readme = "README.md"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is the default value, just remove it. There is even a lint for this (probably in pendantic set).

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