diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-07-11 22:39:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-11 22:39:10 +0200 |
| commit | c05e27776416f211ccf0f163f5e1deddf8fd87b7 (patch) | |
| tree | 24e3000db31e1005dba69b5d779228fbcf553de3 | |
| parent | 5e223dc7b9b541e12514efeb05b915af9b6e508c (diff) | |
| parent | 29c128ad11abad667f8067cea26ddedb39075866 (diff) | |
| download | rust-c05e27776416f211ccf0f163f5e1deddf8fd87b7.tar.gz rust-c05e27776416f211ccf0f163f5e1deddf8fd87b7.zip | |
Rollup merge of #99161 - fee1-dead-contrib:compile-test-edition-trim, r=jyn514
compiletest: trim edition before passing as flag This makes `edition: 2021` work instead of the ugly `edition:2021` one has to write.
| -rw-r--r-- | src/test/ui/async-await/async-await.rs | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/async-await/async-await.rs b/src/test/ui/async-await/async-await.rs index 3d22025bf28..9cabf16f8bb 100644 --- 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 index 7cf4a88c470..21d68586171 100644 --- 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; } |