Fix bug with rustup toolchain overrides detailed in https://github.com/kay/cross-toolchain-override-bug

kay · kay · commit 3ea8eacd0359 · 2020-09-03T17:27:54.000+01:00
diff --git a/src/rustup.rs b/src/rustup.rs
@@ -28,7 +28,7 @@ pub fn installed_toolchains(verbose: bool) -> Result<Vec<String>> {
         .args(&["toolchain", "list"])
         .run_and_get_stdout(verbose)?;
 
-    Ok(out.lines().map(|l| l.replace(" (default)", "").trim().to_owned()).collect())
+    Ok(out.lines().map(|l| l.replace(" (default)", "").replace(" (override)", "").trim().to_owned()).collect())
 }
 
 pub fn available_targets(toolchain: &str, verbose: bool) -> Result<AvailableTargets> {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ pub fn installed_toolchains(verbose: bool) -> Result<Vec<String>> {`
`28`	`28`	`.args(&["toolchain", "list"])`
`29`	`29`	`.run_and_get_stdout(verbose)?;`
`30`	`30`
`31`		`- Ok(out.lines().map(\|l\| l.replace(" (default)", "").trim().to_owned()).collect())`
	`31`	`+ Ok(out.lines().map(\|l\| l.replace(" (default)", "").replace(" (override)", "").trim().to_owned()).collect())`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`pub fn available_targets(toolchain: &str, verbose: bool) -> Result<AvailableTargets> {`