diff options
| author | bors <bors@rust-lang.org> | 2024-01-16 17:33:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-16 17:33:12 +0000 |
| commit | e64f8495e73fbc3653b4bcb73268c58b9c4a0a0d (patch) | |
| tree | 6b16f77d02262d36feed138a7bebb30dedd74ffe /src | |
| parent | bf2637f4e89aab364d7ab28deb09820363bef86d (diff) | |
| parent | 91544102aa603a437dae8e1f9a91496a1602a943 (diff) | |
Auto merge of #120025 - matthiaskrgr:rollup-e9ai06k, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #118361 (stabilise bound_map) - #119816 (Define hidden types in confirmation) - #119900 (Inline `check_closure`, simplify `deduce_sig_from_projection`) - #119969 (Simplify `closure_env_ty` and `closure_env_param`) - #119990 (Add private `NonZero<T>` type alias.) - #119998 (Update books) - #120002 (Lint `overlapping_ranges_endpoints` directly instead of collecting into a Vec) - #120018 (Don't allow `.html` files in `tests/mir-opt/`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| m--------- | src/doc/nomicon | 0 | ||||
| m--------- | src/doc/reference | 0 | ||||
| m--------- | src/doc/rust-by-example | 0 | ||||
| m--------- | src/doc/rustc-dev-guide | 0 | ||||
| -rw-r--r-- | src/tools/miropt-test-tools/src/lib.rs | 11 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/doc/nomicon b/src/doc/nomicon -Subproject f6bd083c4ccfc4ce6699b8b4154e3c45c5a27a8 +Subproject 6bc2415218d4dd0cb01433d8320f5ccf79c343a diff --git a/src/doc/reference b/src/doc/reference -Subproject 3565c7978cfc9662f5963b135690ff9cbbfa031 +Subproject 8c77e8be9da1a9c70545556218d563c8d061f1f diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example -Subproject c0be6299e52e4164c30ba6f41bd0ad0aaee6497 +Subproject ddf5cb0e6ee54ba2dd84c8ca3e1314120014e20 diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide -Subproject d13e85152a977cd0bcaf583cf5f49e86225697d +Subproject 4af29d1a7f64f88a36539662c6a84fe1fbe6cde diff --git a/src/tools/miropt-test-tools/src/lib.rs b/src/tools/miropt-test-tools/src/lib.rs index cae96f59319..7d60033c3e8 100644 --- a/src/tools/miropt-test-tools/src/lib.rs +++ b/src/tools/miropt-test-tools/src/lib.rs @@ -98,11 +98,12 @@ pub fn files_for_miropt_test( from_file = format!("{}.{}.mir", test_name, first_pass); to_file = Some(second_file); } else { - let ext_re = regex::Regex::new(r#"(\.(mir|dot|html))$"#).unwrap(); - let cap = ext_re - .captures_iter(test_name) - .next() - .expect("test_name has an invalid extension"); + // Allow-list for file extensions that can be produced by MIR dumps. + // Other extensions can be added here, as needed by new dump flags. + let ext_re = regex::Regex::new(r#"(\.(mir|dot))$"#).unwrap(); + let cap = ext_re.captures_iter(test_name).next().unwrap_or_else(|| { + panic!("in {testfile:?}:\nEMIT_MIR has an unrecognized extension: {test_name}") + }); let extension = cap.get(1).unwrap().as_str(); expected_file = |
