bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

occured -> occurred

Browse source
This commit is contained in:
Michael Goulet 2025-02-08 22:28:21 +00:00
parent b4641b2b3f
commit a61537f6c0
10 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_middle/src/mir/terminator.rs
View file

@ -272,7 +272,7 @@ impl<O> AssertKind<O> {
"\"misaligned pointer dereference: address must be a multiple of {{}} but is {{}}\", {required:?}, {found:?}" "\"misaligned pointer dereference: address must be a multiple of {{}} but is {{}}\", {required:?}, {found:?}"
) )
} }
NullPointerDereference => write!(f, "\"null pointer dereference occured\""), NullPointerDereference => write!(f, "\"null pointer dereference occurred\""),
ResumedAfterReturn(CoroutineKind::Coroutine(_)) => { ResumedAfterReturn(CoroutineKind::Coroutine(_)) => {
write!(f, "\"coroutine resumed after completion\"") write!(f, "\"coroutine resumed after completion\"")
} }

2
compiler/stable_mir/src/mir/body.rs
View file

@ -307,7 +307,7 @@ impl AssertMessage {
AssertMessage::MisalignedPointerDereference { .. } => { AssertMessage::MisalignedPointerDereference { .. } => {
Ok("misaligned pointer dereference") Ok("misaligned pointer dereference")
} }
AssertMessage::NullPointerDereference => Ok("null pointer dereference occured"), AssertMessage::NullPointerDereference => Ok("null pointer dereference occurred"),
} }
} }
} }

2
compiler/stable_mir/src/mir/pretty.rs
View file

@ -299,7 +299,7 @@ fn pretty_assert_message<W: Write>(writer: &mut W, msg: &AssertMessage) -> io::R
) )
} }
AssertMessage::NullPointerDereference => { AssertMessage::NullPointerDereference => {
write!(writer, "\"null pointer dereference occured.\"") write!(writer, "\"null pointer dereference occurred\"")
} }
AssertMessage::ResumedAfterReturn(_) | AssertMessage::ResumedAfterPanic(_) => { AssertMessage::ResumedAfterReturn(_) | AssertMessage::ResumedAfterPanic(_) => {
write!(writer, "{}", msg.description().unwrap()) write!(writer, "{}", msg.description().unwrap())

2
library/core/src/panicking.rs
View file

@ -302,7 +302,7 @@ fn panic_null_pointer_dereference() -> ! {
} }
panic_nounwind_fmt( panic_nounwind_fmt(
format_args!("null pointer dereference occured"), format_args!("null pointer dereference occurred"),
/* force_no_backtrace */ false, /* force_no_backtrace */ false,
) )
} }

2
tests/ui/mir/null/borrowed_mut_null.rs
View file

@ -1,6 +1,6 @@
//@ run-fail //@ run-fail
//@ compile-flags: -C debug-assertions //@ compile-flags: -C debug-assertions
//@ error-pattern: null pointer dereference occured //@ error-pattern: null pointer dereference occurred
fn main() { fn main() {
let ptr: *mut u32 = std::ptr::null_mut(); let ptr: *mut u32 = std::ptr::null_mut();

2
tests/ui/mir/null/borrowed_null.rs
View file

@ -1,6 +1,6 @@
//@ run-fail //@ run-fail
//@ compile-flags: -C debug-assertions //@ compile-flags: -C debug-assertions
//@ error-pattern: null pointer dereference occured //@ error-pattern: null pointer dereference occurred
fn main() { fn main() {
let ptr: *const u32 = std::ptr::null(); let ptr: *const u32 = std::ptr::null();

2
tests/ui/mir/null/borrowed_null_zst.rs
View file

@ -1,6 +1,6 @@
//@ run-fail //@ run-fail
//@ compile-flags: -C debug-assertions //@ compile-flags: -C debug-assertions
//@ error-pattern: null pointer dereference occured //@ error-pattern: null pointer dereference occurred
fn main() { fn main() {
let ptr: *const () = std::ptr::null(); let ptr: *const () = std::ptr::null();

2
tests/ui/mir/null/null_lhs.rs
View file

@ -1,6 +1,6 @@
//@ run-fail //@ run-fail
//@ compile-flags: -C debug-assertions //@ compile-flags: -C debug-assertions
//@ error-pattern: null pointer dereference occured //@ error-pattern: null pointer dereference occurred
fn main() { fn main() {
let ptr: *mut u32 = std::ptr::null_mut(); let ptr: *mut u32 = std::ptr::null_mut();

2
tests/ui/mir/null/null_rhs.rs
View file

@ -1,6 +1,6 @@
//@ run-fail //@ run-fail
//@ compile-flags: -C debug-assertions //@ compile-flags: -C debug-assertions
//@ error-pattern: null pointer dereference occured //@ error-pattern: null pointer dereference occurred
fn main() { fn main() {
let ptr: *mut u32 = std::ptr::null_mut(); let ptr: *mut u32 = std::ptr::null_mut();

2
tests/ui/mir/null/two_pointers.rs
View file

@ -1,6 +1,6 @@
//@ run-fail //@ run-fail
//@ compile-flags: -C debug-assertions //@ compile-flags: -C debug-assertions
//@ error-pattern: null pointer dereference occured //@ error-pattern: null pointer dereference occurred
fn main() { fn main() {
let ptr = std::ptr::null(); let ptr = std::ptr::null();