Two adjustments to rustc for cargo #15686
Merged
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
| let msg = format!("--crate-name and #[crate_name] \ | ||
| are required to match, but `{}` \ | ||
| != `{}`", s, name); | ||
| sess.span_err(attr.span, msg.as_slice()); |
There was a problem hiding this comment.
You may want to update the comment a few lines above (lines 558-560), as it still claims that the crate name from the command-line is favored.
|
Travis failure says run-pass/crate-name-attr-used.rs failed, because I'm also not really clear what the motivation is for requiring Anyway, r=me with the test fixed and the comment updated. |
Part of the original discussions around the `--crate-name` flag brought up that mass confusion can arise when the flag specifies a different name than is contained in the crate. The current primary use case of the `--crate-name` flag is through cargo and not requiring a `#[crate_name]` attribute, but if the `#[crate_name]` attribute is specified it will likely go awry when the two names deviate from one another. This commit requires that if both are provided they both match to prevent this confusion.
When invoking the compiler in parallel, the intermediate output of the object files and bytecode can stomp over one another if two crates with the same name are being compiled. The output file is already being disambiguated with `-C extra-filename`, so this commit alters the naming of the temporary files to also mix in the extra filename to ensure that file names don't clash.
bors
added a commit
that referenced
this pull request
Jul 19, 2014
The first is to require that `#[crate_name]` and `--crate-name` always match (if both are specified). The second is to fix parallel compilation in cargo by mixing in `-C extra-filename` into the temporary outputs of the compiler.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 13, 2023
Only run tests on linux in pull requests There is little gain from running them on all platforms, they should almost never fail if the linux one pass and if they do, bors will catch it still.
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 first is to require that
#[crate_name]and--crate-namealways match (if both are specified). The second is to fix parallel compilation in cargo by mixing in-C extra-filenameinto the temporary outputs of the compiler.