update code per comments

rust-lang · Nov 8, 2022 · b2bc65b · b2bc65b
1 parent aceca05
commit b2bc65b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -825,7 +825,7 @@ impl<'a> Builder<'a> {
             Subcommand::Install { ref paths } => (Kind::Install, &paths[..]),
             Subcommand::Run { ref paths } => (Kind::Run, &paths[..]),
             Subcommand::Format { .. } => (Kind::Format, &[][..]),
-            Subcommand::Setup { ref paths } => (Kind::Setup, &paths[..]),
+            Subcommand::Setup { ref path } => (Kind::Setup, std::slice::from_ref(path)),
             Subcommand::Clean { .. } => {
                 panic!()
             }

diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs
@@ -142,7 +142,7 @@ pub enum Subcommand {
         paths: Vec<PathBuf>,
     },
     Setup {
-        paths: Vec<PathBuf>,
+        path: PathBuf,
     },
 }
 
@@ -633,7 +633,7 @@ Arguments:
                 } else {
                     t!(crate::setup::interactive_path())
                 };
-                Subcommand::Setup { paths: vec![PathBuf::from(profile.as_str())] }
+                Subcommand::Setup { path: PathBuf::from(profile.as_str()) }
             }
         };
 

diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs
@@ -98,6 +98,10 @@ impl Step for Profile {
     }
 
     fn make_run(run: RunConfig<'_>) {
+        // for Profile, `run.paths` will have 1 and only 1 element
+        // this is because we only accept at most 1 path from user input.
+        // If user calls `x.py setup` without arguments, the interacctive TUI
+        // will guide user to provide one.
         let profile: Profile = run
             .paths
             .first()