about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-10-14 06:02:27 +0900
committerGitHub <noreply@github.com>2020-10-14 06:02:27 +0900
commitec0cabd0fe711683e32df497df9e831292ed2c6d (patch)
tree366ec8639e53ebf74dc2c1e1207cfae1efc9f6a7
parentfe7e794b6a55477ec072acace1f500756edb0b5d (diff)
parent23c3356f9a6069f566e9f6900f5575daed1d526d (diff)
downloadrust-ec0cabd0fe711683e32df497df9e831292ed2c6d.tar.gz
rust-ec0cabd0fe711683e32df497df9e831292ed2c6d.zip
Rollup merge of #77786 - jyn514:rustdoc, r=Mark-Simulacrum
Mention rustdoc in `x.py setup`

This lets new contributors know which option they should pick; previously it wasn't clear 'compiler' also included rustdoc.

Unresolved questions: should this say 'compiler and tools' instead? I don't know of any tools that are modified in-tree other than rustdoc, though.

r? @Mark-Simulacrum
-rw-r--r--src/bootstrap/setup.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs
index 512224156d8..2a9507cfc4c 100644
--- a/src/bootstrap/setup.rs
+++ b/src/bootstrap/setup.rs
@@ -30,7 +30,7 @@ impl FromStr for Profile {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             "a" | "lib" | "library" => Ok(Profile::Library),
-            "b" | "compiler" => Ok(Profile::Compiler),
+            "b" | "compiler" | "rustdoc" => Ok(Profile::Compiler),
             "c" | "llvm" | "codegen" => Ok(Profile::Codegen),
             "d" | "maintainer" | "user" => Ok(Profile::User),
             _ => Err(format!("unknown profile: '{}'", s)),
@@ -108,7 +108,7 @@ pub fn interactive_path() -> io::Result<Profile> {
     println!(
         "Welcome to the Rust project! What do you want to do with x.py?
 a) Contribute to the standard library
-b) Contribute to the compiler
+b) Contribute to the compiler or rustdoc
 c) Contribute to the compiler, and also modify LLVM or codegen
 d) Install Rust from source"
     );