Skip to content

Commit ab1787b

Browse files
committed
core: move intrinsics.rs into intrinsics folder
1 parent 3d1dba8 commit ab1787b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed
File renamed without changes.

Diff for: tests/ui/consts/const-eval/raw-pointer-ub.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ LL | *ptr = 0;
1111
| ^^^^^^^^ accessing memory based on pointer with alignment 1, but alignment 4 is required
1212

1313
error[E0080]: evaluation of constant value failed
14-
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL
14+
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
1515
|
1616
= note: accessing memory with alignment 1, but alignment 4 is required
1717
|
1818
note: inside `copy_nonoverlapping::<u32>`
19-
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL
19+
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
2020
note: inside `std::ptr::const_ptr::<impl *const u32>::copy_to_nonoverlapping`
2121
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
2222
note: inside `MISALIGNED_COPY`

Diff for: tests/ui/intrinsics/const-eval-select-bad.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ LL | const_eval_select((), 42, 0xDEADBEEF);
2727
= help: the trait `FnOnce()` is not implemented for `{integer}`
2828
= note: wrap the `{integer}` in a closure with no arguments: `|| { /* code */ }`
2929
note: required by a bound in `const_eval_select`
30-
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL
30+
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
3131

3232
error[E0277]: expected a `FnOnce()` closure, found `{integer}`
3333
--> $DIR/const-eval-select-bad.rs:10:31
@@ -40,7 +40,7 @@ LL | const_eval_select((), 42, 0xDEADBEEF);
4040
= help: the trait `FnOnce()` is not implemented for `{integer}`
4141
= note: wrap the `{integer}` in a closure with no arguments: `|| { /* code */ }`
4242
note: required by a bound in `const_eval_select`
43-
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL
43+
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
4444

4545
error: this argument must be a function item
4646
--> $DIR/const-eval-select-bad.rs:10:27
@@ -69,7 +69,7 @@ LL | const_eval_select((1,), foo, bar);
6969
| required by a bound introduced by this call
7070
|
7171
note: required by a bound in `const_eval_select`
72-
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL
72+
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
7373

7474
error[E0631]: type mismatch in function arguments
7575
--> $DIR/const-eval-select-bad.rs:37:32
@@ -85,7 +85,7 @@ LL | const_eval_select((true,), foo, baz);
8585
= note: expected function signature `fn(bool) -> _`
8686
found function signature `fn(i32) -> _`
8787
note: required by a bound in `const_eval_select`
88-
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL
88+
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
8989
help: consider wrapping the function in a closure
9090
|
9191
LL | const_eval_select((true,), |arg0: bool| foo(/* i32 */), baz);

0 commit comments

Comments
 (0)