Auto merge of #91692 - matthiaskrgr:rollup-u7dvh0n, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #87599 (Implement concat_bytes!) - #89999 (Update std::env::temp_dir to use GetTempPath2 on Windows when available.) - #90796 (Remove the reg_thumb register class for asm! on ARM) - #91042 (Use Vec extend instead of repeated pushes on several places) - #91634 (Do not attempt to suggest help for overly malformed struct/function call) - #91685 (Install llvm tools to sysroot when assembling local toolchain) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
bors
commit
600820da45
26 changed files with 542 additions and 98 deletions
|
|
@ -59,12 +59,6 @@ macro_rules! check {
|
|||
// CHECK: @NO_APP
|
||||
check!(reg "" reg i32 "mov");
|
||||
|
||||
// CHECK-LABEL: reg_thumb:
|
||||
// CHECK: @APP
|
||||
// CHECK: mov r0, r0
|
||||
// CHECK: @NO_APP
|
||||
check!(reg_thumb "" reg_thumb i32 "mov");
|
||||
|
||||
// CHECK-LABEL: sreg:
|
||||
// CHECK: @APP
|
||||
// CHECK: vmov.f32 s0, s0
|
||||
|
|
|
|||
|
|
@ -163,36 +163,6 @@ check!(reg_f32 f32 reg "mov");
|
|||
// CHECK: @NO_APP
|
||||
check!(reg_ptr ptr reg "mov");
|
||||
|
||||
// CHECK-LABEL: reg_thumb_i8:
|
||||
// CHECK: @APP
|
||||
// CHECK: mov {{[a-z0-9]+}}, {{[a-z0-9]+}}
|
||||
// CHECK: @NO_APP
|
||||
check!(reg_thumb_i8 i8 reg_thumb "mov");
|
||||
|
||||
// CHECK-LABEL: reg_thumb_i16:
|
||||
// CHECK: @APP
|
||||
// CHECK: mov {{[a-z0-9]+}}, {{[a-z0-9]+}}
|
||||
// CHECK: @NO_APP
|
||||
check!(reg_thumb_i16 i16 reg_thumb "mov");
|
||||
|
||||
// CHECK-LABEL: reg_thumb_i32:
|
||||
// CHECK: @APP
|
||||
// CHECK: mov {{[a-z0-9]+}}, {{[a-z0-9]+}}
|
||||
// CHECK: @NO_APP
|
||||
check!(reg_thumb_i32 i32 reg_thumb "mov");
|
||||
|
||||
// CHECK-LABEL: reg_thumb_f32:
|
||||
// CHECK: @APP
|
||||
// CHECK: mov {{[a-z0-9]+}}, {{[a-z0-9]+}}
|
||||
// CHECK: @NO_APP
|
||||
check!(reg_thumb_f32 f32 reg_thumb "mov");
|
||||
|
||||
// CHECK-LABEL: reg_thumb_ptr:
|
||||
// CHECK: @APP
|
||||
// CHECK: mov {{[a-z0-9]+}}, {{[a-z0-9]+}}
|
||||
// CHECK: @NO_APP
|
||||
check!(reg_thumb_ptr ptr reg_thumb "mov");
|
||||
|
||||
// CHECK-LABEL: sreg_i32:
|
||||
// CHECK: @APP
|
||||
// CHECK: vmov.f32 s{{[0-9]+}}, s{{[0-9]+}}
|
||||
|
|
|
|||
4
src/test/ui/feature-gates/feature-gate-concat_bytes.rs
Normal file
4
src/test/ui/feature-gates/feature-gate-concat_bytes.rs
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
fn main() {
|
||||
let a = concat_bytes!(b'A', b"BC"); //~ ERROR use of unstable library feature 'concat_bytes'
|
||||
assert_eq!(a, &[65, 66, 67]);
|
||||
}
|
||||
12
src/test/ui/feature-gates/feature-gate-concat_bytes.stderr
Normal file
12
src/test/ui/feature-gates/feature-gate-concat_bytes.stderr
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
error[E0658]: use of unstable library feature 'concat_bytes'
|
||||
--> $DIR/feature-gate-concat_bytes.rs:2:13
|
||||
|
|
||||
LL | let a = concat_bytes!(b'A', b"BC");
|
||||
| ^^^^^^^^^^^^
|
||||
|
|
||||
= note: see issue #87555 <https://github.com/rust-lang/rust/issues/87555> for more information
|
||||
= help: add `#![feature(concat_bytes)]` to the crate attributes to enable
|
||||
|
||||
error: aborting due to previous error
|
||||
|
||||
For more information about this error, try `rustc --explain E0658`.
|
||||
42
src/test/ui/macros/concat-bytes-error.rs
Normal file
42
src/test/ui/macros/concat-bytes-error.rs
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
#![feature(concat_bytes)]
|
||||
|
||||
fn main() {
|
||||
concat_bytes!(pie); //~ ERROR expected a byte literal
|
||||
concat_bytes!(pie, pie); //~ ERROR expected a byte literal
|
||||
concat_bytes!("tnrsi", "tnri"); //~ ERROR cannot concatenate string literals
|
||||
concat_bytes!(2.8); //~ ERROR cannot concatenate float literals
|
||||
concat_bytes!(300); //~ ERROR cannot concatenate numeric literals
|
||||
concat_bytes!('a'); //~ ERROR cannot concatenate character literals
|
||||
concat_bytes!(true, false); //~ ERROR cannot concatenate boolean literals
|
||||
concat_bytes!(42, b"va", b'l'); //~ ERROR cannot concatenate numeric literals
|
||||
concat_bytes!(42, b"va", b'l', [1, 2]); //~ ERROR cannot concatenate numeric literals
|
||||
concat_bytes!([
|
||||
"hi", //~ ERROR cannot concatenate string literals
|
||||
]);
|
||||
concat_bytes!([
|
||||
'a', //~ ERROR cannot concatenate character literals
|
||||
]);
|
||||
concat_bytes!([
|
||||
true, //~ ERROR cannot concatenate boolean literals
|
||||
]);
|
||||
concat_bytes!([
|
||||
false, //~ ERROR cannot concatenate boolean literals
|
||||
]);
|
||||
concat_bytes!([
|
||||
2.6, //~ ERROR cannot concatenate float literals
|
||||
]);
|
||||
concat_bytes!([
|
||||
265, //~ ERROR numeric literal is out of bounds
|
||||
]);
|
||||
concat_bytes!([
|
||||
-33, //~ ERROR expected a byte literal
|
||||
]);
|
||||
concat_bytes!([
|
||||
b"hi!", //~ ERROR cannot concatenate doubly nested array
|
||||
]);
|
||||
concat_bytes!([
|
||||
[5, 6, 7], //~ ERROR cannot concatenate doubly nested array
|
||||
]);
|
||||
concat_bytes!(5u16); //~ ERROR cannot concatenate numeric literals
|
||||
concat_bytes!([5u16]); //~ ERROR numeric literal is not a `u8`
|
||||
}
|
||||
131
src/test/ui/macros/concat-bytes-error.stderr
Normal file
131
src/test/ui/macros/concat-bytes-error.stderr
Normal file
|
|
@ -0,0 +1,131 @@
|
|||
error: expected a byte literal
|
||||
--> $DIR/concat-bytes-error.rs:4:19
|
||||
|
|
||||
LL | concat_bytes!(pie);
|
||||
| ^^^
|
||||
|
|
||||
= note: only byte literals (like `b"foo"`, `b's'`, and `[3, 4, 5]`) can be passed to `concat_bytes!()`
|
||||
|
||||
error: expected a byte literal
|
||||
--> $DIR/concat-bytes-error.rs:5:19
|
||||
|
|
||||
LL | concat_bytes!(pie, pie);
|
||||
| ^^^ ^^^
|
||||
|
|
||||
= note: only byte literals (like `b"foo"`, `b's'`, and `[3, 4, 5]`) can be passed to `concat_bytes!()`
|
||||
|
||||
error: cannot concatenate string literals
|
||||
--> $DIR/concat-bytes-error.rs:6:19
|
||||
|
|
||||
LL | concat_bytes!("tnrsi", "tnri");
|
||||
| ^^^^^^^ help: try using a byte string: `b"tnrsi"`
|
||||
|
||||
error: cannot concatenate float literals
|
||||
--> $DIR/concat-bytes-error.rs:7:19
|
||||
|
|
||||
LL | concat_bytes!(2.8);
|
||||
| ^^^
|
||||
|
||||
error: cannot concatenate numeric literals
|
||||
--> $DIR/concat-bytes-error.rs:8:19
|
||||
|
|
||||
LL | concat_bytes!(300);
|
||||
| ^^^ help: try wrapping the number in an array: `[300]`
|
||||
|
||||
error: cannot concatenate character literals
|
||||
--> $DIR/concat-bytes-error.rs:9:19
|
||||
|
|
||||
LL | concat_bytes!('a');
|
||||
| ^^^ help: try using a byte character: `b'a'`
|
||||
|
||||
error: cannot concatenate boolean literals
|
||||
--> $DIR/concat-bytes-error.rs:10:19
|
||||
|
|
||||
LL | concat_bytes!(true, false);
|
||||
| ^^^^
|
||||
|
||||
error: cannot concatenate numeric literals
|
||||
--> $DIR/concat-bytes-error.rs:11:19
|
||||
|
|
||||
LL | concat_bytes!(42, b"va", b'l');
|
||||
| ^^ help: try wrapping the number in an array: `[42]`
|
||||
|
||||
error: cannot concatenate numeric literals
|
||||
--> $DIR/concat-bytes-error.rs:12:19
|
||||
|
|
||||
LL | concat_bytes!(42, b"va", b'l', [1, 2]);
|
||||
| ^^ help: try wrapping the number in an array: `[42]`
|
||||
|
||||
error: cannot concatenate string literals
|
||||
--> $DIR/concat-bytes-error.rs:14:9
|
||||
|
|
||||
LL | "hi",
|
||||
| ^^^^
|
||||
|
||||
error: cannot concatenate character literals
|
||||
--> $DIR/concat-bytes-error.rs:17:9
|
||||
|
|
||||
LL | 'a',
|
||||
| ^^^ help: try using a byte character: `b'a'`
|
||||
|
||||
error: cannot concatenate boolean literals
|
||||
--> $DIR/concat-bytes-error.rs:20:9
|
||||
|
|
||||
LL | true,
|
||||
| ^^^^
|
||||
|
||||
error: cannot concatenate boolean literals
|
||||
--> $DIR/concat-bytes-error.rs:23:9
|
||||
|
|
||||
LL | false,
|
||||
| ^^^^^
|
||||
|
||||
error: cannot concatenate float literals
|
||||
--> $DIR/concat-bytes-error.rs:26:9
|
||||
|
|
||||
LL | 2.6,
|
||||
| ^^^
|
||||
|
||||
error: numeric literal is out of bounds
|
||||
--> $DIR/concat-bytes-error.rs:29:9
|
||||
|
|
||||
LL | 265,
|
||||
| ^^^
|
||||
|
||||
error: expected a byte literal
|
||||
--> $DIR/concat-bytes-error.rs:32:9
|
||||
|
|
||||
LL | -33,
|
||||
| ^^^
|
||||
|
|
||||
= note: only byte literals (like `b"foo"`, `b's'`, and `[3, 4, 5]`) can be passed to `concat_bytes!()`
|
||||
|
||||
error: cannot concatenate doubly nested array
|
||||
--> $DIR/concat-bytes-error.rs:35:9
|
||||
|
|
||||
LL | b"hi!",
|
||||
| ^^^^^^
|
||||
|
|
||||
= note: byte strings are treated as arrays of bytes
|
||||
= help: try flattening the array
|
||||
|
||||
error: cannot concatenate doubly nested array
|
||||
--> $DIR/concat-bytes-error.rs:38:9
|
||||
|
|
||||
LL | [5, 6, 7],
|
||||
| ^^^^^^^^^
|
||||
|
||||
error: cannot concatenate numeric literals
|
||||
--> $DIR/concat-bytes-error.rs:40:19
|
||||
|
|
||||
LL | concat_bytes!(5u16);
|
||||
| ^^^^ help: try wrapping the number in an array: `[5u16]`
|
||||
|
||||
error: numeric literal is not a `u8`
|
||||
--> $DIR/concat-bytes-error.rs:41:20
|
||||
|
|
||||
LL | concat_bytes!([5u16]);
|
||||
| ^^^^
|
||||
|
||||
error: aborting due to 20 previous errors
|
||||
|
||||
7
src/test/ui/macros/concat-bytes.rs
Normal file
7
src/test/ui/macros/concat-bytes.rs
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
// run-pass
|
||||
#![feature(concat_bytes)]
|
||||
|
||||
fn main() {
|
||||
assert_eq!(concat_bytes!(), &[]);
|
||||
assert_eq!(concat_bytes!(b'A', b"BC", [68, b'E', 70]), b"ABCDEF");
|
||||
}
|
||||
6
src/test/ui/parser/issues/issue-91461.rs
Normal file
6
src/test/ui/parser/issues/issue-91461.rs
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
fn main() {
|
||||
a(_:b:,)
|
||||
//~^ ERROR: expected identifier, found reserved identifier `_`
|
||||
//~| ERROR: expected type, found `,`
|
||||
//~| ERROR: expected type, found `,`
|
||||
}
|
||||
31
src/test/ui/parser/issues/issue-91461.stderr
Normal file
31
src/test/ui/parser/issues/issue-91461.stderr
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
error: expected identifier, found reserved identifier `_`
|
||||
--> $DIR/issue-91461.rs:2:7
|
||||
|
|
||||
LL | a(_:b:,)
|
||||
| ^ expected identifier, found reserved identifier
|
||||
|
||||
error: expected type, found `,`
|
||||
--> $DIR/issue-91461.rs:2:11
|
||||
|
|
||||
LL | a(_:b:,)
|
||||
| - -^ expected type
|
||||
| | |
|
||||
| | tried to parse a type due to this type ascription
|
||||
| while parsing this struct
|
||||
|
|
||||
= note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
|
||||
= note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
|
||||
|
||||
error: expected type, found `,`
|
||||
--> $DIR/issue-91461.rs:2:11
|
||||
|
|
||||
LL | a(_:b:,)
|
||||
| -^ expected type
|
||||
| |
|
||||
| tried to parse a type due to this type ascription
|
||||
|
|
||||
= note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
|
||||
= note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
|
||||
|
||||
error: aborting due to 3 previous errors
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue