Fix overriding editions and similar custom flags

Author: oli-obk

CHANGELOG.md

@@ -13,6 +13,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+### Removed
+
+## [0.26.4] - 2024-09-09
+
+### Added
+
+### Fixed
+
+* custom flags were not overriding the default, but the other way around.
+
+### Changed
+
 * Made more code public for miri to use
 * Replaced `lazy_static` with std's `OnceLock`
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ui_test"
-version = "0.26.3"
+version = "0.26.4"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "A test framework for testing rustc diagnostics output"

Cargo.toml

@@ -453,7 +453,7 @@ impl CommentParser<Comments> {
         }
 
         for (k, v) in base.custom {
-            custom.entry(k).or_insert(v);
+            custom.insert(k, v);
         }
 
         *self.base() = defaults;

src/parser.rs

@@ -463,6 +463,7 @@ Building aux file tests/actual_tests_bless/auxiliary/the_proc_macro.rs ... ok
 tests/actual_tests_bless/aux_proc_macro_no_main.rs ... FAILED
 tests/actual_tests_bless/compile_flags_quotes.rs ... FAILED
 tests/actual_tests_bless/compiletest-rs-command.rs ... FAILED
+tests/actual_tests_bless/edition_override.rs ... ok
 tests/actual_tests_bless/failing_executable.rs ... ok
 tests/actual_tests_bless/failing_executable.rs (revision `run`) ... FAILED
 Building aux file tests/actual_tests_bless/auxiliary/foomp.rs ... ok
@@ -1079,7 +1080,7 @@ FAILURES:
     tests/actual_tests_bless/unknown_revision2.rs
     tests/actual_tests_bless/wrong_diagnostic_code.rs
 
-test result: FAIL. 23 failed; 25 passed; 3 ignored
+test result: FAIL. 23 failed; 26 passed; 3 ignored
 
 Building dependencies ... ok
 tests/actual_tests_bless_yolo/revisions_bad.rs (revision `foo`) ... ok

tests/integrations/basic-bin/Cargo.lock

@@ -0,0 +1,9 @@
+//@edition: 2018
+//@check-pass
+
+fn main() {
+    match 42 {
+        0...1 => {}
+        _ => {}
+    }
+}

tests/integrations/basic-fail-mode/Cargo.lock

@@ -0,0 +1,12 @@
+warning: `...` range patterns are deprecated
+ --> tests/actual_tests_bless/edition_override.rs:6:10
+  |
+6 |         0...1 => {}
+  |          ^^^ help: use `..=` for an inclusive range
+  |
+  = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
+  = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
+  = note: `#[warn(ellipsis_inclusive_range_patterns)]` on by default
+
+warning: 1 warning emitted
+