From 9777466ffe12fb75580da0d308914cbd3f6b1ec4 Mon Sep 17 00:00:00 2001 From: Jonathan Pallant Date: Fri, 19 Jun 2026 07:33:17 +0000 Subject: [PATCH 1/2] Convert '.' to '_' in bootstrap envify This means you can now use remote-test-client/remote-test-server with targets that contain a '.' in the name. See https://github.com/rust-lang/rust/issues/158090 --- src/bootstrap/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index fd3e88e1a36f4..fbfcc1f8e5571 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -2122,7 +2122,7 @@ impl Compiler { fn envify(s: &str) -> String { s.chars() .map(|c| match c { - '-' => '_', + '-' | '.' => '_', c => c, }) .flat_map(|c| c.to_uppercase()) From 8ef1e865a3dc62b25f8878c36107268b3763c7e5 Mon Sep 17 00:00:00 2001 From: Jonathan Pallant Date: Fri, 19 Jun 2026 08:05:26 +0000 Subject: [PATCH 2/2] Add some additional context in envify --- src/bootstrap/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index fbfcc1f8e5571..2231e0886bbcd 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -2120,6 +2120,8 @@ impl Compiler { } fn envify(s: &str) -> String { + // Converting foo-bar to FOO_BAR is a fairly idomatic mapping to an environment variable name. + // We also convert '.' to '_' to fix https://github.com/rust-lang/rust/issues/158090 s.chars() .map(|c| match c { '-' | '.' => '_',