Rollup merge of rust-lang#99161 - fee1-dead-contrib:compile-test-edition-trim, r=jyn514

matthiaskrgr · web-flow · commit c05e27776416 · 2022-07-11T22:39:10.000+02:00
compiletest: trim edition before passing as flag

This makes `edition: 2021` work instead of the ugly
`edition:2021` one has to write.
diff --git a/src/test/ui/async-await/async-await.rs b/src/test/ui/async-await/async-await.rs
@@ -6,7 +6,7 @@
 
 #![allow(unused)]
 
-// edition:2018
+// edition: 2018
 // aux-build:arc_wake.rs
 
 extern crate arc_wake;
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
@@ -294,7 +294,7 @@ impl TestProps {
                 }
 
                 if let Some(edition) = config.parse_edition(ln) {
-                    self.compile_flags.push(format!("--edition={}", edition));
+                    self.compile_flags.push(format!("--edition={}", edition.trim()));
                     has_edition = true;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ impl TestProps {`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`if let Some(edition) = config.parse_edition(ln) {`
`297`		`- self.compile_flags.push(format!("--edition={}", edition));`
	`297`	`+ self.compile_flags.push(format!("--edition={}", edition.trim()));`
`298`	`298`	`has_edition = true;`
`299`	`299`	`}`
`300`	`300`