diff options
| author | bors <bors@rust-lang.org> | 2023-04-16 21:37:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-16 21:37:51 +0000 |
| commit | 84c898d65adf2f39a5a98507f1fe0ce10a2b8dbc (patch) | |
| tree | 45864520870b60ee1bb662685becc5f0b4804744 /compiler/rustc_middle | |
| parent | f18236dcd3d8191c91aca0c4ef43e1e27b6bc0dc (diff) | |
| parent | c2c413f56eca868a5b5335ba21efa08368735d01 (diff) | |
| download | rust-1.69.0.tar.gz rust-1.69.0.zip | |
Auto merge of #110413 - pietroalbini:pa-1.69.0-stable, r=pietroalbini 1.69.0
[stable] Prepare Rust 1.69.0 Last minute backports: * #109643 * #110135 * #109938 * #109937 * #109266 This PR also bumps the channel to stable, and backports the release notes from master. r? `@ghost` cc `@rust-lang/release`
Diffstat (limited to 'compiler/rustc_middle')
| -rw-r--r-- | compiler/rustc_middle/src/ty/normalize_erasing_regions.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_middle/src/ty/normalize_erasing_regions.rs b/compiler/rustc_middle/src/ty/normalize_erasing_regions.rs index 578cd82aa4c..7c59879a187 100644 --- a/compiler/rustc_middle/src/ty/normalize_erasing_regions.rs +++ b/compiler/rustc_middle/src/ty/normalize_erasing_regions.rs @@ -193,9 +193,9 @@ impl<'tcx> NormalizeAfterErasingRegionsFolder<'tcx> { let arg = self.param_env.and(arg); self.tcx.try_normalize_generic_arg_after_erasing_regions(arg).unwrap_or_else(|_| bug!( - "Failed to normalize {:?}, maybe try to call `try_normalize_erasing_regions` instead", - arg.value - )) + "Failed to normalize {:?}, maybe try to call `try_normalize_erasing_regions` instead", + arg.value + )) } } |