Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 6 pull requests #112889

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.

Sign up for GitHub

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

Closed
wants to merge 19 commits into from
Closed

Rollup of 6 pull requests #112889

Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9de1d7c
document memory orderings of `thread::{park, unpark}`
ibraheemdev Jul 22, 2022
1bae661
tidy
ibraheemdev Oct 5, 2022
6e8a013
improve wording of `thread::park` docs
ibraheemdev Jan 1, 2023
e9868ef
clarify wording around spurious wakeups from `thread::park`
ibraheemdev Apr 11, 2023
bc20a8e
Add `Item::def_id` helper
GuillaumeGomez Jun 19, 2023
db95734
Fix invalid creation of files in rustdoc
GuillaumeGomez Jun 19, 2023
bf27f12
relaxed orderings in `thread::park` example
ibraheemdev Jun 21, 2023
7201271
Fix typo in `eprintln` docs
clubby789 Jun 21, 2023
81e3774
Make queries traceable again
oli-obk Jun 21, 2023
3acb1d2
"Memory Orderings" -> "Memory Ordering"
m-ou-se Jun 21, 2023
91aef00
Fix msg passed to span_bug
imor Jun 21, 2023
e3e65d1
Revert 'Rename profile=user to profile=dist'
clubby789 Jun 21, 2023
3ad595a
Add tests for invalid files generation
GuillaumeGomez Jun 19, 2023
085cfdf
Rollup merge of #99587 - ibraheemdev:park-orderings, r=m-ou-se
GuillaumeGomez Jun 21, 2023
efc9410
Rollup merge of #112836 - GuillaumeGomez:rustdoc-invalid-file-creatio…
GuillaumeGomez Jun 21, 2023
fdae9cd
Rollup merge of #112863 - clubby789:stderr-typo, r=albertlarsan68
GuillaumeGomez Jun 21, 2023
9387fe7
Rollup merge of #112883 - oli-obk:tracing_queries, r=cjgillot
GuillaumeGomez Jun 21, 2023
832b9e5
Rollup merge of #112885 - imor:fix_span_bug_msg, r=cjgillot
GuillaumeGomez Jun 21, 2023
578ae1c
Rollup merge of #112886 - clubby789:revert-user-dist, r=albertlarsan68
GuillaumeGomez Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/bootstrap/setup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub enum Profile {
Codegen,
Library,
Tools,
Dist,
User,
None,
}

Expand All @@ -43,7 +43,7 @@ impl Profile {
pub fn all() -> impl Iterator<Item = Self> {
use Profile::*;
// N.B. these are ordered by how they are displayed, not alphabetically
[Library, Compiler, Codegen, Tools, Dist, None].iter().copied()
[Library, Compiler, Codegen, Tools, User, None].iter().copied()
}

pub fn purpose(&self) -> String {
Expand All @@ -53,7 +53,7 @@ impl Profile {
Compiler => "Contribute to the compiler itself",
Codegen => "Contribute to the compiler, and also modify LLVM or codegen",
Tools => "Contribute to tools which depend on the compiler, but do not modify it directly (e.g. rustdoc, clippy, miri)",
Dist => "Install Rust from source",
User => "Install Rust from source",
None => "Do not modify `config.toml`"
}
.to_string()
Expand All @@ -73,7 +73,7 @@ impl Profile {
Profile::Codegen => "codegen",
Profile::Library => "library",
Profile::Tools => "tools",
Profile::Dist => "dist",
Profile::User => "user",
Profile::None => "none",
}
}
Expand All @@ -87,7 +87,7 @@ impl FromStr for Profile {
"lib" | "library" => Ok(Profile::Library),
"compiler" => Ok(Profile::Compiler),
"llvm" | "codegen" => Ok(Profile::Codegen),
"maintainer" | "dist" => Ok(Profile::Dist),
"maintainer" | "user" => Ok(Profile::User),
"tools" | "tool" | "rustdoc" | "clippy" | "miri" | "rustfmt" | "rls" => {
Ok(Profile::Tools)
}
Expand Down Expand Up @@ -160,7 +160,7 @@ pub fn setup(config: &Config, profile: Profile) {
"test src/tools/rustfmt",
],
Profile::Library => &["check", "build", "test library/std", "doc"],
Profile::Dist => &["dist", "build"],
Profile::User => &["dist", "build"],
};

println!();
Expand All @@ -170,7 +170,7 @@ pub fn setup(config: &Config, profile: Profile) {
println!("- `x.py {}`", cmd);
}

if profile != Profile::Dist {
if profile != Profile::User {
println!(
"For more suggestions, see https://rustc-dev-guide.rust-lang.org/building/suggested.html"
);
Expand Down