toolchain: switch to the minimal rustup profile and allow configuring it

Author: pietroalbini

CHANGELOG.md

@@ -5,8 +5,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- New method `WorkspaceBuilder::rustup_profile` to configure the rustup profile
+  used during builds.
+
 ### Changed
 
+- **BREAKING**: The default rustup profile is now `minimal`.
 - The directory `target/` inside local crates won't be copied into the build
   anymore.
 - Symbolic links will be followed instead of copied as links.

src/toolchain.rs

@@ -171,7 +171,13 @@ impl std::fmt::Display for Toolchain {
 fn init_toolchain_from_dist(workspace: &Workspace, toolchain: &str) -> Result<(), Error> {
     info!("installing toolchain {}", toolchain);
     Command::new(workspace, &RUSTUP)
-        .args(&["toolchain", "install", toolchain])
+        .args(&[
+            "toolchain",
+            "install",
+            toolchain,
+            "--profile",
+            workspace.rustup_profile(),
+        ])
         .run()
         .with_context(|_| format!("unable to install toolchain {} via rustup", toolchain))?;
 

src/tools/rustup.rs

@@ -56,16 +56,15 @@ impl Tool for Rustup {
             crate::native::make_executable(installer)?;
         }
 
-        // TODO(rustup.rs#998): Remove `.no_output_timeout(true)` once rust-docs is no longer a
-        // mandatory component.
         Command::new(workspace, installer.to_string_lossy().as_ref())
             .args(&[
                 "-y",
                 "--no-modify-path",
                 "--default-toolchain",
                 MAIN_TOOLCHAIN_NAME,
+                "--profile",
+                workspace.rustup_profile(),
             ])
-            .no_output_timeout(None)
             .env("RUSTUP_HOME", workspace.rustup_home())
             .env("CARGO_HOME", workspace.cargo_home())
             .run()

src/workspace.rs

@@ -18,6 +18,8 @@ static DEFAULT_SANDBOX_IMAGE: &str = "rustops/crates-build-env";
 const DEFAULT_COMMAND_TIMEOUT: Option<Duration> = Some(Duration::from_secs(15 * 60));
 const DEFAULT_COMMAND_NO_OUTPUT_TIMEOUT: Option<Duration> = None;
 
+static DEFAULT_RUSTUP_PROFILE: &str = "minimal";
+
 /// Builder of a [`Workspace`](struct.Workspace.html).
 pub struct WorkspaceBuilder {
     user_agent: String,
@@ -28,6 +30,7 @@ pub struct WorkspaceBuilder {
     fetch_registry_index_during_builds: bool,
     running_inside_docker: bool,
     fast_init: bool,
+    rustup_profile: String,
 }
 
 impl WorkspaceBuilder {
@@ -45,6 +48,7 @@ impl WorkspaceBuilder {
             fetch_registry_index_during_builds: true,
             running_inside_docker: false,
             fast_init: false,
+            rustup_profile: DEFAULT_RUSTUP_PROFILE.into(),
         }
     }
 
@@ -125,6 +129,12 @@ impl WorkspaceBuilder {
         self
     }
 
+    /// Name of the rustup profile used when installing toolchains. The default is `minimal`.
+    pub fn rustup_profile(mut self, profile: &str) -> Self {
+        self.rustup_profile = profile.into();
+        self
+    }
+
     /// Initialize the workspace. This will create all the necessary local files and fetch the rest from the network. It's
     /// not unexpected for this method to take minutes to run on slower network connections.
     pub fn init(self) -> Result<Workspace, Error> {
@@ -157,6 +167,7 @@ impl WorkspaceBuilder {
                     command_no_output_timeout: self.command_no_output_timeout,
                     fetch_registry_index_during_builds: self.fetch_registry_index_during_builds,
                     current_container: None,
+                    rustup_profile: self.rustup_profile,
                 }),
             };
 
@@ -179,6 +190,7 @@ struct WorkspaceInner {
     command_no_output_timeout: Option<Duration>,
     fetch_registry_index_during_builds: bool,
     current_container: Option<CurrentContainer>,
+    rustup_profile: String,
 }
 
 /// Directory on the filesystem containing rustwide's state and caches.
@@ -272,6 +284,10 @@ impl Workspace {
         self.inner.current_container.as_ref()
     }
 
+    pub(crate) fn rustup_profile(&self) -> &str {
+        &self.inner.rustup_profile
+    }
+
     fn init(&self, fast_init: bool) -> Result<(), Error> {
         info!("installing tools required by rustwide");
         crate::tools::install(self, fast_init)?;