config -> toolchain-file; override -> path-override

Author: smoelius

src/config.rs

@@ -109,8 +109,8 @@ impl ActiveReason {
             Self::Default => "default",
             Self::Environment => "env",
             Self::CommandLine => "cli",
-            Self::OverrideDB(_) => "override",
-            Self::ToolchainFile(_) => "config",
+            Self::OverrideDB(_) => "path-override",
+            Self::ToolchainFile(_) => "toolchain-file",
         }
     }
 }

tests/suite/cli_rustup.rs

@@ -3072,7 +3072,7 @@ env
 }
 
 #[tokio::test]
-async fn rustup_toolchain_source_override() {
+async fn rustup_toolchain_source_path_override() {
     let cx = CliTestContext::new(Scenario::SimpleV2).await;
     cx.config
         .expect(["rustup", "override", "set", "nightly"])
@@ -3083,13 +3083,13 @@ async fn rustup_toolchain_source_override() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-override
+path-override
 
 "#]]);
 }
 
 #[tokio::test]
-async fn rustup_toolchain_source_config() {
+async fn rustup_toolchain_source_toolchain_file() {
     let cx = CliTestContext::new(Scenario::SimpleV2).await;
     let toolchain_file = cx.config.current_dir().join("rust-toolchain.toml");
     raw::write_file(&toolchain_file, "[toolchain]\nchannel='nightly'").unwrap();
@@ -3098,7 +3098,7 @@ async fn rustup_toolchain_source_config() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-config
+toolchain-file
 
 "#]]);
 }