Skip to content

Commit 0784395

Browse files
authored
Rollup merge of #63737 - HowJMay:fix_naming, r=jonas-schievink
Fix naming misspelling Fixes #63734
2 parents 8a26ba7 + 4f613ff commit 0784395

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

src/test/ui/non-interger-atomic.stderr renamed to src/test/ui/non-integer-atomic.stderr

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,95 @@
11
error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `bool`
2-
--> $DIR/non-interger-atomic.rs:13:5
2+
--> $DIR/non-integer-atomic.rs:13:5
33
|
44
LL | intrinsics::atomic_load(p);
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `bool`
8-
--> $DIR/non-interger-atomic.rs:18:5
8+
--> $DIR/non-integer-atomic.rs:18:5
99
|
1010
LL | intrinsics::atomic_store(p, v);
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212

1313
error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `bool`
14-
--> $DIR/non-interger-atomic.rs:23:5
14+
--> $DIR/non-integer-atomic.rs:23:5
1515
|
1616
LL | intrinsics::atomic_xchg(p, v);
1717
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1818

1919
error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `bool`
20-
--> $DIR/non-interger-atomic.rs:28:5
20+
--> $DIR/non-integer-atomic.rs:28:5
2121
|
2222
LL | intrinsics::atomic_cxchg(p, v, v);
2323
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2424

2525
error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `Foo`
26-
--> $DIR/non-interger-atomic.rs:33:5
26+
--> $DIR/non-integer-atomic.rs:33:5
2727
|
2828
LL | intrinsics::atomic_load(p);
2929
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
3030

3131
error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `Foo`
32-
--> $DIR/non-interger-atomic.rs:38:5
32+
--> $DIR/non-integer-atomic.rs:38:5
3333
|
3434
LL | intrinsics::atomic_store(p, v);
3535
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3636

3737
error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `Foo`
38-
--> $DIR/non-interger-atomic.rs:43:5
38+
--> $DIR/non-integer-atomic.rs:43:5
3939
|
4040
LL | intrinsics::atomic_xchg(p, v);
4141
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4242

4343
error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `Foo`
44-
--> $DIR/non-interger-atomic.rs:48:5
44+
--> $DIR/non-integer-atomic.rs:48:5
4545
|
4646
LL | intrinsics::atomic_cxchg(p, v, v);
4747
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4848

4949
error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()`
50-
--> $DIR/non-interger-atomic.rs:53:5
50+
--> $DIR/non-integer-atomic.rs:53:5
5151
|
5252
LL | intrinsics::atomic_load(p);
5353
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
5454

5555
error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()`
56-
--> $DIR/non-interger-atomic.rs:58:5
56+
--> $DIR/non-integer-atomic.rs:58:5
5757
|
5858
LL | intrinsics::atomic_store(p, v);
5959
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6060

6161
error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()`
62-
--> $DIR/non-interger-atomic.rs:63:5
62+
--> $DIR/non-integer-atomic.rs:63:5
6363
|
6464
LL | intrinsics::atomic_xchg(p, v);
6565
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6666

6767
error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()`
68-
--> $DIR/non-interger-atomic.rs:68:5
68+
--> $DIR/non-integer-atomic.rs:68:5
6969
|
7070
LL | intrinsics::atomic_cxchg(p, v, v);
7171
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7272

7373
error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `[u8; 100]`
74-
--> $DIR/non-interger-atomic.rs:73:5
74+
--> $DIR/non-integer-atomic.rs:73:5
7575
|
7676
LL | intrinsics::atomic_load(p);
7777
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
7878

7979
error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `[u8; 100]`
80-
--> $DIR/non-interger-atomic.rs:78:5
80+
--> $DIR/non-integer-atomic.rs:78:5
8181
|
8282
LL | intrinsics::atomic_store(p, v);
8383
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8484

8585
error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `[u8; 100]`
86-
--> $DIR/non-interger-atomic.rs:83:5
86+
--> $DIR/non-integer-atomic.rs:83:5
8787
|
8888
LL | intrinsics::atomic_xchg(p, v);
8989
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9090

9191
error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `[u8; 100]`
92-
--> $DIR/non-interger-atomic.rs:88:5
92+
--> $DIR/non-integer-atomic.rs:88:5
9393
|
9494
LL | intrinsics::atomic_cxchg(p, v, v);
9595
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)