Skip to content

Commit 88ab797

Browse files
committed
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
2 parents 699a4f5 + 8ca1c1e commit 88ab797

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/machine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1775,7 +1775,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
17751775
let is_generic = instance
17761776
.args
17771777
.into_iter()
1778-
.any(|kind| !matches!(kind.unpack(), ty::GenericArgKind::Lifetime(_)));
1778+
.any(|arg| !matches!(arg.kind(), ty::GenericArgKind::Lifetime(_)));
17791779
let can_be_inlined = matches!(
17801780
ecx.tcx.sess.opts.unstable_opts.cross_crate_inline_threshold,
17811781
InliningThreshold::Always

0 commit comments

Comments
 (0)