fix: Allow embedded manifests in all commands #12289
Merged
bors merged 8 commits intorust-lang:masterfrom Jun 21, 2023
Merged
Conversation
I originally centralized the error reporting until I realized it likely is intentionally not centralized so we report errors in terms of the arguments the user provided.
Collaborator
|
r? @ehuss (rustbot has picked a reviewer for you, use r? to override) |
39 tasks
There should be a later check when parsing but just in case, let's have a check here as well.
epage
added a commit
to epage/typos
that referenced
this pull request
Jun 20, 2023
In 3a29410, we switched to anstream which doesn't seem to be locking properly (rust-lang/cargo#12289). For now, we are working around it. Fixes crate-ci#749
weihanglo
reviewed
Jun 21, 2023
Member
weihanglo
left a comment
There was a problem hiding this comment.
Looks good. Just wanting more tests to cover these error paths.
| pub fn is_embedded(path: &Path) -> bool { | ||
| let ext = path.extension(); | ||
| ext.is_none() || ext == Some(OsStr::new("rs")) | ||
| ext == Some(OsStr::new("rs")) || |
Member
There was a problem hiding this comment.
- Should we always verify that embedded manifest is a file?
- Can we have some tests around this? Like failure when
script.rsis a directory. - (Not a blocker) Is it worth having a better error message for each failed case?
Contributor
Author
There was a problem hiding this comment.
Should we always verify that embedded manifest is a file?
We have a separate, more specific error check for that.
(Not a blocker) Is it worth having a better error message for each failed case?
What do you have in mind?
Member
There was a problem hiding this comment.
- When missing file at manifest-path, it shows
error: the manifest-path must be a path to a Cargo.toml file - When
script.rsis a directory, it showserror: failed to read `/projects/cargo/test.rs` Caused by: Is a directory (os error 21)
Contributor
Author
There was a problem hiding this comment.
When script.rs is a directory, it shows
This is true for Cargo.toml as well. We can more generally improve it though that is unrelated to this PR
weihanglo
approved these changes
Jun 21, 2023
Member
|
Thanks for the update! @bors r+ |
Contributor
Contributor
Contributor
|
☀️ Test successful - checks-actions |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 22, 2023
Update cargo 2 commits in dead4b8740c4b6a8ed5211e37c99cf81d01c3b1c..4cebd130ebca3bc219180a54f3e26cc1b14a91de 2023-06-20 20:07:17 +0000 to 2023-06-21 18:59:29 +0000 - fix: Allow embedded manifests in all commands (rust-lang/cargo#12289) - feat(cli): Support `cargo Cargo.toml` (rust-lang/cargo#12281) r? `@ghost`
phip1611
pushed a commit
to phip1611/typos
that referenced
this pull request
Dec 5, 2023
In 3a29410, we switched to anstream which doesn't seem to be locking properly (rust-lang/cargo#12289). For now, we are working around it. Fixes crate-ci#749
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
What does this PR try to resolve?
This is a part of #12207.
One of the goals is for embedded manifests to be a first class citizen. If you have a script, you should be able to run tests on it, for example.
This expands the error check from just
Cargo.tomlto also single-file packages so you can use it in--manifest-path.This, however, does mean that these can be used in places that likely won't work yet, like
cargo publish.How should we test and review this PR?
By commit. We introduce tests for basic commands and then implement and refine the support for this.
Additional information
Other information you want to mention in this PR, such as prior arts,
future extensions, an unresolved problem, or a TODO list.