Skip to content

Commit 679a22a

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#133689
Rollup merge of rust-lang#133689 - HomelikeBrick42:master, r=jieyouxu Fixed typos by changing `happend` to `happened` I just noticed this typo before and decided to fix it :3
2 parents 8ac313b + 4cb1582 commit 679a22a

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

‎compiler/rustc_lint/messages.ftl

+3-3
Original file line numberDiff line numberDiff line change
@@ -450,15 +450,15 @@ lint_invalid_nan_comparisons_eq_ne = incorrect NaN comparison, NaN cannot be dir
450450
lint_invalid_nan_comparisons_lt_le_gt_ge = incorrect NaN comparison, NaN is not orderable
451451
452452
lint_invalid_reference_casting_assign_to_ref = assigning to `&T` is undefined behavior, consider using an `UnsafeCell`
453-
.label = casting happend here
453+
.label = casting happened here
454454
455455
lint_invalid_reference_casting_bigger_layout = casting references to a bigger memory layout than the backing allocation is undefined behavior, even if the reference is unused
456-
.label = casting happend here
456+
.label = casting happened here
457457
.alloc = backing allocation comes from here
458458
.layout = casting from `{$from_ty}` ({$from_size} bytes) to `{$to_ty}` ({$to_size} bytes)
459459
460460
lint_invalid_reference_casting_borrow_as_mut = casting `&T` to `&mut T` is undefined behavior, even if the reference is unused, consider instead using an `UnsafeCell`
461-
.label = casting happend here
461+
.label = casting happened here
462462
463463
lint_invalid_reference_casting_note_book = for more information, visit <https://doc.rust-lang.org/book/ch15-05-interior-mutability.html>
464464

‎tests/ui/lint/reference_casting.stderr

+12-12
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ error: casting `&T` to `&mut T` is undefined behavior, even if the reference is
103103
--> $DIR/reference_casting.rs:45:16
104104
|
105105
LL | let deferred = num as *const i32 as *mut i32;
106-
| ----------------------------- casting happend here
106+
| ----------------------------- casting happened here
107107
LL | let _num = &mut *deferred;
108108
| ^^^^^^^^^^^^^^
109109
|
@@ -113,7 +113,7 @@ error: casting `&T` to `&mut T` is undefined behavior, even if the reference is
113113
--> $DIR/reference_casting.rs:48:16
114114
|
115115
LL | let deferred = (std::ptr::from_ref(num) as *const i32 as *const i32).cast_mut() as *mut i32;
116-
| ---------------------------------------------------------------------------- casting happend here
116+
| ---------------------------------------------------------------------------- casting happened here
117117
LL | let _num = &mut *deferred;
118118
| ^^^^^^^^^^^^^^
119119
|
@@ -123,7 +123,7 @@ error: casting `&T` to `&mut T` is undefined behavior, even if the reference is
123123
--> $DIR/reference_casting.rs:51:16
124124
|
125125
LL | let deferred = (std::ptr::from_ref(num) as *const i32 as *const i32).cast_mut() as *mut i32;
126-
| ---------------------------------------------------------------------------- casting happend here
126+
| ---------------------------------------------------------------------------- casting happened here
127127
...
128128
LL | let _num = &mut *deferred_rebind;
129129
| ^^^^^^^^^^^^^^^^^^^^^
@@ -150,7 +150,7 @@ error: casting `&T` to `&mut T` is undefined behavior, even if the reference is
150150
--> $DIR/reference_casting.rs:62:16
151151
|
152152
LL | let num = NUM as *const i32 as *mut i32;
153-
| ----------------------------- casting happend here
153+
| ----------------------------- casting happened here
154154
...
155155
LL | let _num = &mut *num;
156156
| ^^^^^^^^^
@@ -279,7 +279,7 @@ error: assigning to `&T` is undefined behavior, consider using an `UnsafeCell`
279279
--> $DIR/reference_casting.rs:115:5
280280
|
281281
LL | let value = num as *const i32 as *mut i32;
282-
| ----------------------------- casting happend here
282+
| ----------------------------- casting happened here
283283
LL | *value = 1;
284284
| ^^^^^^^^^^
285285
|
@@ -289,7 +289,7 @@ error: assigning to `&T` is undefined behavior, consider using an `UnsafeCell`
289289
--> $DIR/reference_casting.rs:119:5
290290
|
291291
LL | let value = value as *mut i32;
292-
| ----------------- casting happend here
292+
| ----------------- casting happened here
293293
LL | *value = 1;
294294
| ^^^^^^^^^^
295295
|
@@ -299,7 +299,7 @@ error: assigning to `&T` is undefined behavior, consider using an `UnsafeCell`
299299
--> $DIR/reference_casting.rs:122:5
300300
|
301301
LL | let value = num as *const i32 as *mut i32;
302-
| ----------------------------- casting happend here
302+
| ----------------------------- casting happened here
303303
LL | *value = 1;
304304
| ^^^^^^^^^^
305305
|
@@ -309,7 +309,7 @@ error: assigning to `&T` is undefined behavior, consider using an `UnsafeCell`
309309
--> $DIR/reference_casting.rs:125:5
310310
|
311311
LL | let value = num as *const i32 as *mut i32;
312-
| ----------------------------- casting happend here
312+
| ----------------------------- casting happened here
313313
...
314314
LL | *value_rebind = 1;
315315
| ^^^^^^^^^^^^^^^^^
@@ -336,7 +336,7 @@ error: assigning to `&T` is undefined behavior, consider using an `UnsafeCell`
336336
--> $DIR/reference_casting.rs:131:5
337337
|
338338
LL | let value = num as *const i32 as *mut i32;
339-
| ----------------------------- casting happend here
339+
| ----------------------------- casting happened here
340340
...
341341
LL | std::ptr::write(value, 2);
342342
| ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -347,7 +347,7 @@ error: assigning to `&T` is undefined behavior, consider using an `UnsafeCell`
347347
--> $DIR/reference_casting.rs:133:5
348348
|
349349
LL | let value = num as *const i32 as *mut i32;
350-
| ----------------------------- casting happend here
350+
| ----------------------------- casting happened here
351351
...
352352
LL | std::ptr::write_unaligned(value, 2);
353353
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -358,7 +358,7 @@ error: assigning to `&T` is undefined behavior, consider using an `UnsafeCell`
358358
--> $DIR/reference_casting.rs:135:5
359359
|
360360
LL | let value = num as *const i32 as *mut i32;
361-
| ----------------------------- casting happend here
361+
| ----------------------------- casting happened here
362362
...
363363
LL | std::ptr::write_volatile(value, 2);
364364
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -496,7 +496,7 @@ LL | let w: *mut [u16; 2] = &mut l as *mut [u8; 2] as *mut _;
496496
| --------------------------------
497497
| | |
498498
| | backing allocation comes from here
499-
| casting happend here
499+
| casting happened here
500500
LL | let w: *mut [u16] = unsafe {&mut *w};
501501
| ^^^^^^^
502502
|

0 commit comments

Comments
 (0)