prevent configuring the edition with //@compile-flags

pietroalbini · pietroalbini · commit 2638e4e8b226 · 2025-04-10T09:57:15.000+02:00
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
@@ -378,7 +378,13 @@ impl TestProps {
                     }
 
                     if let Some(flags) = config.parse_name_value_directive(ln, COMPILE_FLAGS) {
-                        self.compile_flags.extend(split_flags(&flags));
+                        let flags = split_flags(&flags);
+                        for flag in &flags {
+                            if flag == "--edition" || flag.starts_with("--edition=") {
+                                panic!("you must use `//@ edition` to configure the edition");
+                            }
+                        }
+                        self.compile_flags.extend(flags);
                     }
                     if config.parse_name_value_directive(ln, INCORRECT_COMPILER_FLAGS).is_some() {
                         panic!("`compiler-flags` directive should be spelled `compile-flags`");

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,13 @@ impl TestProps {`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`if let Some(flags) = config.parse_name_value_directive(ln, COMPILE_FLAGS) {`
`381`		`- self.compile_flags.extend(split_flags(&flags));`
	`381`	`+ let flags = split_flags(&flags);`
	`382`	`+ for flag in &flags {`
	`383`	`+ if flag == "--edition" \|\| flag.starts_with("--edition=") {`
	`384`	+ panic!("you must use `//@ edition` to configure the edition");
	`385`	`+ }`
	`386`	`+ }`
	`387`	`+ self.compile_flags.extend(flags);`
`382`	`388`	`}`
`383`	`389`	`if config.parse_name_value_directive(ln, INCORRECT_COMPILER_FLAGS).is_some() {`
`384`	`390`	panic!("`compiler-flags` directive should be spelled `compile-flags`");