Skip to content

Commit 199f963

Browse files
committed
Auto merge of #120112 - matthiaskrgr:rollup-48o3919, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #119582 (bootstrap: handle vendored sources when remapping crate paths) - #119730 (docs: fix typos) - #119828 (Improved collapse_debuginfo attribute, added command-line flag) - #119869 (replace `track_errors` usages with bubbling up `ErrorGuaranteed`) - #120037 (Remove `next_root_ty_var`) - #120094 (tests/ui/asm/inline-syntax: adapt for LLVM 18) - #120096 (Set RUSTC_BOOTSTRAP=1 consistently) - #120101 (change `.unwrap()` to `?` on write where `fmt::Result` is returned) - #120102 (Fix typo in munmap_partial.rs) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 93c4500 + ab100b2 commit 199f963

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/fail-dep/shims/munmap_partial.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//! The man pages for mmap/munmap suggest that it is possible to partly unmap a previously-mapped
2-
//! region of addres space, but to LLVM that would be partial deallocation, which LLVM does not
2+
//! region of address space, but to LLVM that would be partial deallocation, which LLVM does not
33
//! support. So even though the man pages say this sort of use is possible, we must report UB.
44
//@ignore-target-windows: No libc on Windows
55
//@normalize-stderr-test: "size [0-9]+ and alignment" -> "size SIZE and alignment"

0 commit comments

Comments
 (0)