mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #132639 - RalfJung:intrinsics, r=workingjubilee,Amanieu

Browse Source 
core: move intrinsics.rs into intrinsics folder

This makes the rustbot notification we have set up for this folder in `triagebot.toml` actually work. Also IMO it makes more sense to have it all in one folder.
This commit is contained in:
Jubilee 2024-11-07 18:48:23 -08:00 committed by GitHub
commit 0683e031a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
library/core/src/intrinsics.rs → library/core/src/intrinsics/mod.rs
View File

4
tests/ui/consts/const-eval/raw-pointer-ub.stderr
View File

@ -11,12 +11,12 @@ LL | *ptr = 0;
| ^^^^^^^^ accessing memory based on pointer with alignment 1, but alignment 4 is required | ^^^^^^^^ accessing memory based on pointer with alignment 1, but alignment 4 is required
error[E0080]: evaluation of constant value failed error[E0080]: evaluation of constant value failed
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL --> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
| |
= note: accessing memory with alignment 1, but alignment 4 is required = note: accessing memory with alignment 1, but alignment 4 is required
| |
note: inside `copy_nonoverlapping::<u32>` note: inside `copy_nonoverlapping::<u32>`
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL --> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
note: inside `std::ptr::const_ptr::<impl *const u32>::copy_to_nonoverlapping` note: inside `std::ptr::const_ptr::<impl *const u32>::copy_to_nonoverlapping`
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
note: inside `MISALIGNED_COPY` note: inside `MISALIGNED_COPY`

8
tests/ui/intrinsics/const-eval-select-bad.stderr
View File

@ -27,7 +27,7 @@ LL | const_eval_select((), 42, 0xDEADBEEF);
= help: the trait `FnOnce()` is not implemented for `{integer}` = help: the trait `FnOnce()` is not implemented for `{integer}`
= note: wrap the `{integer}` in a closure with no arguments: `|| { /* code */ }` = note: wrap the `{integer}` in a closure with no arguments: `|| { /* code */ }`
note: required by a bound in `const_eval_select` note: required by a bound in `const_eval_select`
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL --> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
error[E0277]: expected a `FnOnce()` closure, found `{integer}` error[E0277]: expected a `FnOnce()` closure, found `{integer}`
--> $DIR/const-eval-select-bad.rs:10:31 --> $DIR/const-eval-select-bad.rs:10:31
@ -40,7 +40,7 @@ LL | const_eval_select((), 42, 0xDEADBEEF);
= help: the trait `FnOnce()` is not implemented for `{integer}` = help: the trait `FnOnce()` is not implemented for `{integer}`
= note: wrap the `{integer}` in a closure with no arguments: `|| { /* code */ }` = note: wrap the `{integer}` in a closure with no arguments: `|| { /* code */ }`
note: required by a bound in `const_eval_select` note: required by a bound in `const_eval_select`
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL --> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
error: this argument must be a function item error: this argument must be a function item
--> $DIR/const-eval-select-bad.rs:10:27 --> $DIR/const-eval-select-bad.rs:10:27
@ -69,7 +69,7 @@ LL | const_eval_select((1,), foo, bar);
| required by a bound introduced by this call | required by a bound introduced by this call
| |
note: required by a bound in `const_eval_select` note: required by a bound in `const_eval_select`
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL --> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
error[E0631]: type mismatch in function arguments error[E0631]: type mismatch in function arguments
--> $DIR/const-eval-select-bad.rs:37:32 --> $DIR/const-eval-select-bad.rs:37:32
@ -85,7 +85,7 @@ LL | const_eval_select((true,), foo, baz);
= note: expected function signature `fn(bool) -> _` = note: expected function signature `fn(bool) -> _`
found function signature `fn(i32) -> _` found function signature `fn(i32) -> _`
note: required by a bound in `const_eval_select` note: required by a bound in `const_eval_select`
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL --> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
help: consider wrapping the function in a closure help: consider wrapping the function in a closure
| |
LL | const_eval_select((true,), |arg0: bool| foo(/* i32 */), baz); LL | const_eval_select((true,), |arg0: bool| foo(/* i32 */), baz);