Reject subdirectory manifests that are not members of the workspace #93
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MarijnS95
force-pushed
the
manifest-not-in-workspace
branch
from
c356fda
to
0efafc1
Compare
The previous implementation had one fatal flaw: having a non-workspace `Cargo.toml` in a subdirectory, with a `[workspace]` defined some directories higher is invalid when that `[workspace]` doesn't include the given `Cargo.toml` subdirectory/package. `cargo` rejects this with a `current package believes it's in a workspace when it's not`, and we should do the same instead of having an `unwrap_or_else` that falls back to using the workspace root `Cargo.toml` as a package (especially if it might not contain a `[package]` at all). This would for example fail when running `x new template` in the repo directory, `cd`'ing into it and invoking `x build`. Instead of complaining about `template/Cargo.toml` not being part of the workspace, it detects the workspace and falls back to building the root package because the `template` directory appears to just be a subdirectory of the root without defining a subpackage along it. Since our root doesn't define a `[package]`, the supposed-to-be-infallible `unwrap()` on `manifest.package` below fails.
MarijnS95
force-pushed
the
manifest-not-in-workspace
branch
from
0efafc1
to
c817b5a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The previous implementation had one fatal flaw: having a non-workspace
Cargo.tomlin a subdirectory, with a[workspace]defined some directories higher is invalid when that[workspace]doesn't include the givenCargo.tomlsubdirectory/package.cargorejects this with acurrent package believes it's in a workspace when it's not, and we should do the same instead of having anunwrap_or_elsethat falls back to using the workspace rootCargo.tomlas a package (especially if it might not contain a[package]at all).This would for example fail when running
x new templatein the repo directory,cd'ing into it and invokingx build. Instead of complaining abouttemplate/Cargo.tomlnot being part of the workspace, it detects the workspace and falls back to building the root package because thetemplatedirectory appears to just be a subdirectory of the root without defining a subpackage along it. Since our root doesn't define a[package], the supposed-to-be-infallibleunwrap()onmanifest.packagebelow fails.