Skip to content

Commit 91f22c4

Browse files
committed
Auto merge of rust-lang#142997 - workingjubilee:rollup-6lxec87, r=workingjubilee
Rollup of 15 pull requests Successful merges: - rust-lang#135731 (Implement parsing of pinned borrows) - rust-lang#138780 (Add `#[loop_match]` for improved DFA codegen) - rust-lang#142453 (Windows: make `read_dir` stop iterating after the first error is encountered) - rust-lang#142633 (Error on invalid signatures for interrupt ABIs) - rust-lang#142768 (Avoid a bitcast FFI call in transmuting) - rust-lang#142825 (Port `#[track_caller]` to the new attribute system) - rust-lang#142844 (Enable short-ice for Windows) - rust-lang#142934 (Tweak `-Zmacro-stats` measurement.) - rust-lang#142955 (Couple of test suite fixes for cg_clif) - rust-lang#142977 (rustdoc: Don't mark `#[target_feature]` functions as ⚠) - rust-lang#142980 (Reduce mismatched-lifetime-syntaxes suggestions to MaybeIncorrect) - rust-lang#142982 (Corrected spelling mistake in c_str.rs) - rust-lang#142983 (Taint body on invalid call ABI) - rust-lang#142988 (Update wasm-component-ld to 0.5.14) - rust-lang#142993 (Update cargo) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 884bfed + 25b2208 commit 91f22c4

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

core/src/ffi/c_str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ impl CStr {
467467
/// // 💀 this violates `CStr::from_ptr`'s safety contract
468468
/// // 💀 leading to a dereference of a dangling pointer,
469469
/// // 💀 which is immediate undefined behavior.
470-
/// // 💀 *BOOM*, you're dead, you're entire program has no meaning.
470+
/// // 💀 *BOOM*, you're dead, your entire program has no meaning.
471471
/// dbg!(unsafe { CStr::from_ptr(ptr) });
472472
/// ```
473473
///

std/src/sys/fs/windows.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ impl Iterator for ReadDir {
132132
let mut wfd = mem::zeroed();
133133
loop {
134134
if c::FindNextFileW(handle.0, &mut wfd) == 0 {
135+
self.handle = None;
135136
match api::get_last_error() {
136137
WinError::NO_MORE_FILES => return None,
137138
WinError { code } => {

0 commit comments

Comments
 (0)