diff options
| author | bors <bors@rust-lang.org> | 2025-05-27 18:59:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-27 18:59:47 +0000 |
| commit | 45f256d9d7cffb66185c0bf1b8a864cba79db90c (patch) | |
| tree | 4944e765bd2e520e4de9e977a78e769099e06de4 /compiler/rustc_const_eval/src | |
| parent | c583fa6d8425dbb38fe5d1dbd007f9ca8e4aa128 (diff) | |
| parent | c7d0a61e2211dd3821933aae7ab83e9e0b043f37 (diff) | |
| download | rust-45f256d9d7cffb66185c0bf1b8a864cba79db90c.tar.gz rust-45f256d9d7cffb66185c0bf1b8a864cba79db90c.zip | |
Auto merge of #141662 - matthiaskrgr:rollup-9kt4zj7, r=matthiaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang/rust#141312 (Add From<TryLockError> for io::Error)
- rust-lang/rust#141495 (Rename `{GenericArg,Term}::unpack()` to `kind()`)
- rust-lang/rust#141602 (triagebot: label LLVM submodule changes with `A-LLVM`)
- rust-lang/rust#141632 (remove `visit_mt` from `ast::mut_visit`)
- rust-lang/rust#141640 (test: convert version_check ui test to run-make)
- rust-lang/rust#141645 (bump fluent-* crates)
- rust-lang/rust#141650 (coverage: Revert "unused local file IDs" due to empty function names)
- rust-lang/rust#141654 (tests: mark option-niche-eq as fixed on LLVM 21)
Failed merges:
- rust-lang/rust#141430 (remove `visit_clobber` and move `DummyAstNode` to `rustc_expand`)
- rust-lang/rust#141636 (avoid some usages of `&mut P<T>` in AST visitors)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src')
| -rw-r--r-- | compiler/rustc_const_eval/src/check_consts/ops.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_const_eval/src/util/type_name.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_const_eval/src/check_consts/ops.rs b/compiler/rustc_const_eval/src/check_consts/ops.rs index 1e5b98675c4..177ba56b165 100644 --- a/compiler/rustc_const_eval/src/check_consts/ops.rs +++ b/compiler/rustc_const_eval/src/check_consts/ops.rs @@ -281,7 +281,7 @@ fn build_error_for_const_call<'tcx>( let mut sugg = None; if ccx.tcx.is_lang_item(trait_id, LangItem::PartialEq) { - match (args[0].unpack(), args[1].unpack()) { + match (args[0].kind(), args[1].kind()) { (GenericArgKind::Type(self_ty), GenericArgKind::Type(rhs_ty)) if self_ty == rhs_ty && self_ty.is_ref() diff --git a/compiler/rustc_const_eval/src/util/type_name.rs b/compiler/rustc_const_eval/src/util/type_name.rs index 30e96ae4143..e8f2728a772 100644 --- a/compiler/rustc_const_eval/src/util/type_name.rs +++ b/compiler/rustc_const_eval/src/util/type_name.rs @@ -125,7 +125,7 @@ impl<'tcx> Printer<'tcx> for AbsolutePathPrinter<'tcx> { ) -> Result<(), PrintError> { print_prefix(self)?; let args = - args.iter().cloned().filter(|arg| !matches!(arg.unpack(), GenericArgKind::Lifetime(_))); + args.iter().cloned().filter(|arg| !matches!(arg.kind(), GenericArgKind::Lifetime(_))); if args.clone().next().is_some() { self.generic_delimiters(|cx| cx.comma_sep(args)) } else { |