Skip to content

Commit e4e742a

Browse files
authored
Rollup merge of rust-lang#145113 - petrochenkov:lessfinalize, r=lcnr
resolve: Do not finalize shadowed bindings I.e. do not mark them as used, or non-speculatively loaded, or similar. Previously they were sometimes finalized during early resolution, causing issues like rust-lang#144793 (comment).
2 parents aae37fe + ebc750f commit e4e742a

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

alloctests/tests/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
#![deny(unsafe_op_in_unsafe_fn)]
4848

4949
extern crate alloc;
50-
extern crate test;
5150

5251
use std::hash::{DefaultHasher, Hash, Hasher};
5352

std/src/sys/pal/unix/stack_overflow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ mod imp {
7272
use crate::sync::OnceLock;
7373
use crate::sync::atomic::{Atomic, AtomicBool, AtomicPtr, AtomicUsize, Ordering};
7474
use crate::sys::pal::unix::os;
75-
use crate::{io, mem, panic, ptr};
75+
use crate::{io, mem, ptr};
7676

7777
// Signal handler for the SIGSEGV and SIGBUS handlers. We've got guard pages
7878
// (unmapped pages) at the end of every thread's stack, so if a thread ends

0 commit comments

Comments
 (0)