Skip to content

Commit e4b14ce

Browse files
committed
Auto merge of rust-lang#102068 - cjgillot:erased-lifetime-print, r=eholk
Always print '_, even for erased lifetimes. Explicit lifetime arguments are now the recommended syntax in rust 2018 and rust 2021. This PR applies this discipline to rustc itself.
2 parents 6e81886 + 26db3e3 commit e4b14ce

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/fail/concurrency/windows_join_detached.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
1010
= note: inside `std::sys::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/PLATFORM/thread.rs:LL:CC
11-
= note: inside `std::thread::JoinInner::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
11+
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1212
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1313
note: inside `main` at $DIR/windows_join_detached.rs:LL:CC
1414
--> $DIR/windows_join_detached.rs:LL:CC

0 commit comments

Comments
 (0)