diff options
| author | bors <bors@rust-lang.org> | 2024-04-24 19:26:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-24 19:26:50 +0000 |
| commit | ef8b9dcf23700f2e2265317611460d3a65c19eff (patch) | |
| tree | a59d95c79196056a4d9242c895dad863d92f492f /compiler | |
| parent | 7bb4f0889e8b133c5b03c46f31f2ae6432c00219 (diff) | |
| parent | eaeaeb92a5756a596d28d8952b6a85c67ee72d5f (diff) | |
| download | rust-ef8b9dcf23700f2e2265317611460d3a65c19eff.tar.gz rust-ef8b9dcf23700f2e2265317611460d3a65c19eff.zip | |
Auto merge of #124330 - fmease:rollup-a98y7jf, r=fmease
Rollup of 6 pull requests Successful merges: - #123316 (Test `#[unix_sigpipe = "inherit"]` with both `SIG_DFL` and `SIG_IGN`) - #123794 (More DefineOpaqueTypes::Yes) - #123881 (Bump Fuchsia versions) - #124281 (fix weak memory bug in TLS on Windows) - #124282 (windows fill_utf16_buf: explain the expected return value) - #124308 (Add diagnostic item for `std::iter::Enumerate`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_hir_typeck/src/coercion.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_hir_typeck/src/coercion.rs b/compiler/rustc_hir_typeck/src/coercion.rs index 9ebb5f95f05..4165fa7f07d 100644 --- a/compiler/rustc_hir_typeck/src/coercion.rs +++ b/compiler/rustc_hir_typeck/src/coercion.rs @@ -1139,7 +1139,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { // are the same function and their parameters have a LUB. match self.commit_if_ok(|_| { self.at(cause, self.param_env).lub( - DefineOpaqueTypes::No, + DefineOpaqueTypes::Yes, prev_ty, new_ty, ) diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index 8abf42e2c13..99591b5e144 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -192,6 +192,7 @@ symbols! { Duration, Encodable, Encoder, + Enumerate, Eq, Equal, Err, |