user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compiletest: Do not require annotations on empty labels and suggestions

Browse source
This commit is contained in:
Vadim Petrochenkov 2025-05-03 14:10:58 +03:00
parent 097cd98869
commit 879b12e2ce
43 changed files with 168 additions and 450 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tools/compiletest/src/json.rs
View file

@ -181,8 +181,6 @@ fn push_actual_errors(
.filter(|(_, span)| Path::new(&span.file_name) == Path::new(&file_name))
.collect();
let spans_in_this_file: Vec<_> = spans_info_in_this_file.iter().map(|(_, span)| span).collect();
let primary_spans: Vec<_> = spans_info_in_this_file
.iter()
.filter(|(is_primary, _)| *is_primary)
@ -280,7 +278,9 @@ fn push_actual_errors(
line_num: Some(span.line_start + index),
kind: ErrorKind::Suggestion,
msg: line.to_string(),
require_annotation: true,
// Empty suggestions (suggestions to remove something) are common
// and annotating them in source is not useful.
require_annotation: !line.is_empty(),
});
}
}
@ -294,13 +294,16 @@ fn push_actual_errors(
}
// Add notes for any labels that appear in the message.
for span in spans_in_this_file.iter().filter(|span| span.label.is_some()) {
errors.push(Error {
line_num: Some(span.line_start),
kind: ErrorKind::Note,
msg: span.label.clone().unwrap(),
require_annotation: true,
});
for (_, span) in spans_info_in_this_file {
if let Some(label) = &span.label {
errors.push(Error {
line_num: Some(span.line_start),
kind: ErrorKind::Note,
msg: label.clone(),
// Empty labels (only underlining spans) are common and do not need annotations.
require_annotation: !label.is_empty(),
});
}
}
// Flatten out the children.

1
tests/incremental/circular-dependencies.rs
View file

@ -15,7 +15,6 @@ pub struct Foo;
pub fn consume_foo(_: Foo) {}
//[cfail2]~^ NOTE function defined here
//[cfail2]~| NOTE
pub fn produce_foo() -> Foo {
Foo

1
tests/ui/consts/const_in_pattern/reject_non_structural.rs
View file

@ -93,7 +93,6 @@ fn main() {
//~| NOTE constant of non-structural type
trait Trait: Sized { const ASSOC: Option<Self>; } //~ NOTE constant defined here
//~^ NOTE
impl Trait for NoDerive { const ASSOC: Option<NoDerive> = Some(NoDerive); }
match Some(NoDerive) { NoDerive::ASSOC => dbg!(NoDerive::ASSOC), _ => panic!("whoops"), };
//~^ ERROR constant of non-structural type `NoDerive` in a pattern

8
tests/ui/consts/const_in_pattern/reject_non_structural.stderr
View file

@ -118,14 +118,14 @@ LL | impl PartialEq for NoDerive { fn eq(&self, _: &Self) -> bool { false } }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: constant of non-structural type `NoDerive` in a pattern
--> $DIR/reject_non_structural.rs:98:28
--> $DIR/reject_non_structural.rs:97:28
|
LL | struct NoDerive;
| --------------- `NoDerive` must be annotated with `#[derive(PartialEq)]` to be usable in patterns
...
LL | trait Trait: Sized { const ASSOC: Option<Self>; }
| ------------------ ------------------------- constant defined here
...
LL | impl Trait for NoDerive { const ASSOC: Option<NoDerive> = Some(NoDerive); }
LL | match Some(NoDerive) { NoDerive::ASSOC => dbg!(NoDerive::ASSOC), _ => panic!("whoops"), };
| ^^^^^^^^^^^^^^^ constant of non-structural type
|
@ -136,7 +136,7 @@ LL | impl PartialEq for NoDerive { fn eq(&self, _: &Self) -> bool { false } }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: constant of non-structural type `NoDerive` in a pattern
--> $DIR/reject_non_structural.rs:103:28
--> $DIR/reject_non_structural.rs:102:28
|
LL | struct NoDerive;
| --------------- `NoDerive` must be annotated with `#[derive(PartialEq)]` to be usable in patterns
@ -153,7 +153,7 @@ LL | impl PartialEq for NoDerive { fn eq(&self, _: &Self) -> bool { false } }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: constant of non-structural type `NoDerive` in a pattern
--> $DIR/reject_non_structural.rs:108:29
--> $DIR/reject_non_structural.rs:107:29
|
LL | struct NoDerive;
| --------------- `NoDerive` must be annotated with `#[derive(PartialEq)]` to be usable in patterns

1
tests/ui/fn/param-mismatch-foreign.rs
View file

@ -1,7 +1,6 @@
extern "C" {
fn foo(x: i32, y: u32, z: i32);
//~^ NOTE function defined here
//~| NOTE
}
fn main() {

2
tests/ui/fn/param-mismatch-foreign.stderr
View file

@ -1,5 +1,5 @@
error[E0061]: this function takes 3 arguments but 2 arguments were supplied
--> $DIR/param-mismatch-foreign.rs:8:5
--> $DIR/param-mismatch-foreign.rs:7:5
|
LL | foo(1i32, 2i32);
| ^^^ ---- argument #2 of type `u32` is missing

1
tests/ui/fn/signature-error-reporting-under-verbose.rs
View file

@ -4,7 +4,6 @@ fn foo(_: i32, _: i32) {}
fn needs_ptr(_: fn(i32, u32)) {}
//~^ NOTE function defined here
//~| NOTE
fn main() {
needs_ptr(foo);

2
tests/ui/fn/signature-error-reporting-under-verbose.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/signature-error-reporting-under-verbose.rs:10:15
--> $DIR/signature-error-reporting-under-verbose.rs:9:15
|
LL | needs_ptr(foo);
| --------- ^^^ expected fn pointer, found fn item

4
tests/ui/issues/issue-48131.rs
View file

@ -1,13 +1,12 @@
// This note is annotated because the purpose of the test
// is to ensure that certain other notes are not generated.
#![deny(unused_unsafe)] //~ NOTE
#![deny(unused_unsafe)]
// (test that no note is generated on this unsafe fn)
pub unsafe fn a() {
fn inner() {
unsafe { /* unnecessary */ } //~ ERROR unnecessary `unsafe`
//~^ NOTE
}
inner()
@ -18,7 +17,6 @@ pub fn b() {
unsafe {
fn inner() {
unsafe { /* unnecessary */ } //~ ERROR unnecessary `unsafe`
//~^ NOTE
}
// `()` is fine to zero-initialize as it is zero sized and inhabited.
let () = ::std::mem::zeroed();

2
tests/ui/issues/issue-48131.stderr
View file

@ -11,7 +11,7 @@ LL | #![deny(unused_unsafe)]
| ^^^^^^^^^^^^^
error: unnecessary `unsafe` block
--> $DIR/issue-48131.rs:20:13
--> $DIR/issue-48131.rs:19:13
|
LL | unsafe { /* unnecessary */ }
| ^^^^^^ unnecessary `unsafe` block

1
tests/ui/mismatched_types/dont-point-return-on-E0308.rs
View file

@ -2,7 +2,6 @@
async fn f(_: &()) {}
//~^ NOTE function defined here
//~| NOTE
// Second note is the span of the underlined argument, I think...
fn main() {

2
tests/ui/mismatched_types/dont-point-return-on-E0308.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/dont-point-return-on-E0308.rs:11:11
--> $DIR/dont-point-return-on-E0308.rs:10:11
|
LL | f(());
| - ^^ expected `&()`, found `()`

3
tests/ui/mismatched_types/similar_paths_primitive.rs
View file

@ -4,9 +4,8 @@ struct bool; //~ NOTE the other `bool` is defined in the current crate
struct str; //~ NOTE the other `str` is defined in the current crate
fn foo(_: bool) {} //~ NOTE function defined here
//~^ NOTE
fn bar(_: &str) {} //~ NOTE function defined here
//~^ NOTE
fn main() {
foo(true);
//~^ ERROR mismatched types [E0308]

6
tests/ui/mismatched_types/similar_paths_primitive.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/similar_paths_primitive.rs:11:9
--> $DIR/similar_paths_primitive.rs:10:9
|
LL | foo(true);
| --- ^^^^ expected `bool`, found a different `bool`
@ -20,7 +20,7 @@ LL | fn foo(_: bool) {}
| ^^^ -------
error[E0308]: mismatched types
--> $DIR/similar_paths_primitive.rs:17:9
--> $DIR/similar_paths_primitive.rs:16:9
|
LL | bar("hello");
| --- ^^^^^^^ expected `str`, found a different `str`
@ -35,7 +35,7 @@ note: the other `str` is defined in the current crate
LL | struct str;
| ^^^^^^^^^^
note: function defined here
--> $DIR/similar_paths_primitive.rs:8:4
--> $DIR/similar_paths_primitive.rs:7:4
|
LL | fn bar(_: &str) {}
| ^^^ -------

11
tests/ui/numeric/numeric-suffix/numeric-suffix-i32.fixed
View file

@ -12,17 +12,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<i32>(42_i32);

11
tests/ui/numeric/numeric-suffix/numeric-suffix-i32.rs
View file

@ -12,17 +12,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<i32>(42_usize);

22
tests/ui/numeric/numeric-suffix/numeric-suffix-i32.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i32.rs:28:16
--> $DIR/numeric-suffix-i32.rs:17:16
|
LL | foo::<i32>(42_usize);
| ---------- ^^^^^^^^ expected `i32`, found `usize`
@ -18,7 +18,7 @@ LL + foo::<i32>(42_i32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i32.rs:32:16
--> $DIR/numeric-suffix-i32.rs:21:16
|
LL | foo::<i32>(42_u64);
| ---------- ^^^^^^ expected `i32`, found `u64`
@ -37,7 +37,7 @@ LL + foo::<i32>(42_i32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i32.rs:36:16
--> $DIR/numeric-suffix-i32.rs:25:16
|
LL | foo::<i32>(42_u32);
| ---------- ^^^^^^ expected `i32`, found `u32`
@ -56,7 +56,7 @@ LL + foo::<i32>(42_i32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i32.rs:40:16
--> $DIR/numeric-suffix-i32.rs:29:16
|
LL | foo::<i32>(42_u16);
| ---------- ^^^^^^ expected `i32`, found `u16`
@ -75,7 +75,7 @@ LL + foo::<i32>(42_i32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i32.rs:44:16
--> $DIR/numeric-suffix-i32.rs:33:16
|
LL | foo::<i32>(42_u8);
| ---------- ^^^^^ expected `i32`, found `u8`
@ -94,7 +94,7 @@ LL + foo::<i32>(42_i32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i32.rs:48:16
--> $DIR/numeric-suffix-i32.rs:37:16
|
LL | foo::<i32>(42_isize);
| ---------- ^^^^^^^^ expected `i32`, found `isize`
@ -113,7 +113,7 @@ LL + foo::<i32>(42_i32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i32.rs:52:16
--> $DIR/numeric-suffix-i32.rs:41:16
|
LL | foo::<i32>(42_i64);
| ---------- ^^^^^^ expected `i32`, found `i64`
@ -132,7 +132,7 @@ LL + foo::<i32>(42_i32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i32.rs:57:16
--> $DIR/numeric-suffix-i32.rs:46:16
|
LL | foo::<i32>(42_i16);
| ---------- ^^^^^^ expected `i32`, found `i16`
@ -151,7 +151,7 @@ LL + foo::<i32>(42_i32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i32.rs:61:16
--> $DIR/numeric-suffix-i32.rs:50:16
|
LL | foo::<i32>(42_i8);
| ---------- ^^^^^ expected `i32`, found `i8`
@ -170,7 +170,7 @@ LL + foo::<i32>(42_i32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i32.rs:65:16
--> $DIR/numeric-suffix-i32.rs:54:16
|
LL | foo::<i32>(42.0_f64);
| ---------- ^^^^^^^^ expected `i32`, found `f64`
@ -189,7 +189,7 @@ LL + foo::<i32>(42i32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i32.rs:69:16
--> $DIR/numeric-suffix-i32.rs:58:16
|
LL | foo::<i32>(42.0_f32);
| ---------- ^^^^^^^^ expected `i32`, found `f32`

11
tests/ui/numeric/numeric-suffix/numeric-suffix-i64.fixed
View file

@ -12,17 +12,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<i64>(42_i64);

11
tests/ui/numeric/numeric-suffix/numeric-suffix-i64.rs
View file

@ -12,17 +12,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<i64>(42_usize);

22
tests/ui/numeric/numeric-suffix/numeric-suffix-i64.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i64.rs:28:16
--> $DIR/numeric-suffix-i64.rs:17:16
|
LL | foo::<i64>(42_usize);
| ---------- ^^^^^^^^ expected `i64`, found `usize`
@ -18,7 +18,7 @@ LL + foo::<i64>(42_i64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i64.rs:32:16
--> $DIR/numeric-suffix-i64.rs:21:16
|
LL | foo::<i64>(42_u64);
| ---------- ^^^^^^ expected `i64`, found `u64`
@ -37,7 +37,7 @@ LL + foo::<i64>(42_i64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i64.rs:36:16
--> $DIR/numeric-suffix-i64.rs:25:16
|
LL | foo::<i64>(42_u32);
| ---------- ^^^^^^ expected `i64`, found `u32`
@ -56,7 +56,7 @@ LL + foo::<i64>(42_i64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i64.rs:40:16
--> $DIR/numeric-suffix-i64.rs:29:16
|
LL | foo::<i64>(42_u16);
| ---------- ^^^^^^ expected `i64`, found `u16`
@ -75,7 +75,7 @@ LL + foo::<i64>(42_i64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i64.rs:44:16
--> $DIR/numeric-suffix-i64.rs:33:16
|
LL | foo::<i64>(42_u8);
| ---------- ^^^^^ expected `i64`, found `u8`
@ -94,7 +94,7 @@ LL + foo::<i64>(42_i64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i64.rs:48:16
--> $DIR/numeric-suffix-i64.rs:37:16
|
LL | foo::<i64>(42_isize);
| ---------- ^^^^^^^^ expected `i64`, found `isize`
@ -113,7 +113,7 @@ LL + foo::<i64>(42_i64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i64.rs:53:16
--> $DIR/numeric-suffix-i64.rs:42:16
|
LL | foo::<i64>(42_i32);
| ---------- ^^^^^^ expected `i64`, found `i32`
@ -132,7 +132,7 @@ LL + foo::<i64>(42_i64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i64.rs:57:16
--> $DIR/numeric-suffix-i64.rs:46:16
|
LL | foo::<i64>(42_i16);
| ---------- ^^^^^^ expected `i64`, found `i16`
@ -151,7 +151,7 @@ LL + foo::<i64>(42_i64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i64.rs:61:16
--> $DIR/numeric-suffix-i64.rs:50:16
|
LL | foo::<i64>(42_i8);
| ---------- ^^^^^ expected `i64`, found `i8`
@ -170,7 +170,7 @@ LL + foo::<i64>(42_i64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i64.rs:65:16
--> $DIR/numeric-suffix-i64.rs:54:16
|
LL | foo::<i64>(42.0_f64);
| ---------- ^^^^^^^^ expected `i64`, found `f64`
@ -189,7 +189,7 @@ LL + foo::<i64>(42i64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-i64.rs:69:16
--> $DIR/numeric-suffix-i64.rs:58:16
|
LL | foo::<i64>(42.0_f32);
| ---------- ^^^^^^^^ expected `i64`, found `f32`

11
tests/ui/numeric/numeric-suffix/numeric-suffix-isize.fixed
View file

@ -12,17 +12,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<isize>(42_isize);

11
tests/ui/numeric/numeric-suffix/numeric-suffix-isize.rs
View file

@ -12,17 +12,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<isize>(42_usize);

22
tests/ui/numeric/numeric-suffix/numeric-suffix-isize.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/numeric-suffix-isize.rs:28:18
--> $DIR/numeric-suffix-isize.rs:17:18
|
LL | foo::<isize>(42_usize);
| ------------ ^^^^^^^^ expected `isize`, found `usize`
@ -18,7 +18,7 @@ LL + foo::<isize>(42_isize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-isize.rs:32:18
--> $DIR/numeric-suffix-isize.rs:21:18
|
LL | foo::<isize>(42_u64);
| ------------ ^^^^^^ expected `isize`, found `u64`
@ -37,7 +37,7 @@ LL + foo::<isize>(42_isize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-isize.rs:36:18
--> $DIR/numeric-suffix-isize.rs:25:18
|
LL | foo::<isize>(42_u32);
| ------------ ^^^^^^ expected `isize`, found `u32`
@ -56,7 +56,7 @@ LL + foo::<isize>(42_isize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-isize.rs:40:18
--> $DIR/numeric-suffix-isize.rs:29:18
|
LL | foo::<isize>(42_u16);
| ------------ ^^^^^^ expected `isize`, found `u16`
@ -75,7 +75,7 @@ LL + foo::<isize>(42_isize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-isize.rs:44:18
--> $DIR/numeric-suffix-isize.rs:33:18
|
LL | foo::<isize>(42_u8);
| ------------ ^^^^^ expected `isize`, found `u8`
@ -94,7 +94,7 @@ LL + foo::<isize>(42_isize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-isize.rs:49:18
--> $DIR/numeric-suffix-isize.rs:38:18
|
LL | foo::<isize>(42_i64);
| ------------ ^^^^^^ expected `isize`, found `i64`
@ -113,7 +113,7 @@ LL + foo::<isize>(42_isize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-isize.rs:53:18
--> $DIR/numeric-suffix-isize.rs:42:18
|
LL | foo::<isize>(42_i32);
| ------------ ^^^^^^ expected `isize`, found `i32`
@ -132,7 +132,7 @@ LL + foo::<isize>(42_isize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-isize.rs:57:18
--> $DIR/numeric-suffix-isize.rs:46:18
|
LL | foo::<isize>(42_i16);
| ------------ ^^^^^^ expected `isize`, found `i16`
@ -151,7 +151,7 @@ LL + foo::<isize>(42_isize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-isize.rs:61:18
--> $DIR/numeric-suffix-isize.rs:50:18
|
LL | foo::<isize>(42_i8);
| ------------ ^^^^^ expected `isize`, found `i8`
@ -170,7 +170,7 @@ LL + foo::<isize>(42_isize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-isize.rs:65:18
--> $DIR/numeric-suffix-isize.rs:54:18
|
LL | foo::<isize>(42.0_f64);
| ------------ ^^^^^^^^ expected `isize`, found `f64`
@ -189,7 +189,7 @@ LL + foo::<isize>(42isize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-isize.rs:69:18
--> $DIR/numeric-suffix-isize.rs:58:18
|
LL | foo::<isize>(42.0_f32);
| ------------ ^^^^^^^^ expected `isize`, found `f32`

11
tests/ui/numeric/numeric-suffix/numeric-suffix-u32.fixed
View file

@ -12,17 +12,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<u32>(42_u32);

11
tests/ui/numeric/numeric-suffix/numeric-suffix-u32.rs
View file

@ -12,17 +12,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<u32>(42_usize);

22
tests/ui/numeric/numeric-suffix/numeric-suffix-u32.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u32.rs:28:16
--> $DIR/numeric-suffix-u32.rs:17:16
|
LL | foo::<u32>(42_usize);
| ---------- ^^^^^^^^ expected `u32`, found `usize`
@ -18,7 +18,7 @@ LL + foo::<u32>(42_u32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u32.rs:32:16
--> $DIR/numeric-suffix-u32.rs:21:16
|
LL | foo::<u32>(42_u64);
| ---------- ^^^^^^ expected `u32`, found `u64`
@ -37,7 +37,7 @@ LL + foo::<u32>(42_u32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u32.rs:37:16
--> $DIR/numeric-suffix-u32.rs:26:16
|
LL | foo::<u32>(42_u16);
| ---------- ^^^^^^ expected `u32`, found `u16`
@ -56,7 +56,7 @@ LL + foo::<u32>(42_u32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u32.rs:41:16
--> $DIR/numeric-suffix-u32.rs:30:16
|
LL | foo::<u32>(42_u8);
| ---------- ^^^^^ expected `u32`, found `u8`
@ -75,7 +75,7 @@ LL + foo::<u32>(42_u32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u32.rs:45:16
--> $DIR/numeric-suffix-u32.rs:34:16
|
LL | foo::<u32>(42_isize);
| ---------- ^^^^^^^^ expected `u32`, found `isize`
@ -94,7 +94,7 @@ LL + foo::<u32>(42_u32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u32.rs:49:16
--> $DIR/numeric-suffix-u32.rs:38:16
|
LL | foo::<u32>(42_i64);
| ---------- ^^^^^^ expected `u32`, found `i64`
@ -113,7 +113,7 @@ LL + foo::<u32>(42_u32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u32.rs:53:16
--> $DIR/numeric-suffix-u32.rs:42:16
|
LL | foo::<u32>(42_i32);
| ---------- ^^^^^^ expected `u32`, found `i32`
@ -132,7 +132,7 @@ LL + foo::<u32>(42_u32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u32.rs:57:16
--> $DIR/numeric-suffix-u32.rs:46:16
|
LL | foo::<u32>(42_i16);
| ---------- ^^^^^^ expected `u32`, found `i16`
@ -151,7 +151,7 @@ LL + foo::<u32>(42_u32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u32.rs:61:16
--> $DIR/numeric-suffix-u32.rs:50:16
|
LL | foo::<u32>(42_i8);
| ---------- ^^^^^ expected `u32`, found `i8`
@ -170,7 +170,7 @@ LL + foo::<u32>(42_u32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u32.rs:65:16
--> $DIR/numeric-suffix-u32.rs:54:16
|
LL | foo::<u32>(42.0_f64);
| ---------- ^^^^^^^^ expected `u32`, found `f64`
@ -189,7 +189,7 @@ LL + foo::<u32>(42u32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u32.rs:69:16
--> $DIR/numeric-suffix-u32.rs:58:16
|
LL | foo::<u32>(42.0_f32);
| ---------- ^^^^^^^^ expected `u32`, found `f32`

11
tests/ui/numeric/numeric-suffix/numeric-suffix-u64.fixed
View file

@ -12,17 +12,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<u64>(42_u64);

11
tests/ui/numeric/numeric-suffix/numeric-suffix-u64.rs
View file

@ -12,17 +12,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<u64>(42_usize);

22
tests/ui/numeric/numeric-suffix/numeric-suffix-u64.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u64.rs:28:16
--> $DIR/numeric-suffix-u64.rs:17:16
|
LL | foo::<u64>(42_usize);
| ---------- ^^^^^^^^ expected `u64`, found `usize`
@ -18,7 +18,7 @@ LL + foo::<u64>(42_u64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u64.rs:33:16
--> $DIR/numeric-suffix-u64.rs:22:16
|
LL | foo::<u64>(42_u32);
| ---------- ^^^^^^ expected `u64`, found `u32`
@ -37,7 +37,7 @@ LL + foo::<u64>(42_u64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u64.rs:37:16
--> $DIR/numeric-suffix-u64.rs:26:16
|
LL | foo::<u64>(42_u16);
| ---------- ^^^^^^ expected `u64`, found `u16`
@ -56,7 +56,7 @@ LL + foo::<u64>(42_u64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u64.rs:41:16
--> $DIR/numeric-suffix-u64.rs:30:16
|
LL | foo::<u64>(42_u8);
| ---------- ^^^^^ expected `u64`, found `u8`
@ -75,7 +75,7 @@ LL + foo::<u64>(42_u64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u64.rs:45:16
--> $DIR/numeric-suffix-u64.rs:34:16
|
LL | foo::<u64>(42_isize);
| ---------- ^^^^^^^^ expected `u64`, found `isize`
@ -94,7 +94,7 @@ LL + foo::<u64>(42_u64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u64.rs:49:16
--> $DIR/numeric-suffix-u64.rs:38:16
|
LL | foo::<u64>(42_i64);
| ---------- ^^^^^^ expected `u64`, found `i64`
@ -113,7 +113,7 @@ LL + foo::<u64>(42_u64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u64.rs:53:16
--> $DIR/numeric-suffix-u64.rs:42:16
|
LL | foo::<u64>(42_i32);
| ---------- ^^^^^^ expected `u64`, found `i32`
@ -132,7 +132,7 @@ LL + foo::<u64>(42_u64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u64.rs:57:16
--> $DIR/numeric-suffix-u64.rs:46:16
|
LL | foo::<u64>(42_i16);
| ---------- ^^^^^^ expected `u64`, found `i16`
@ -151,7 +151,7 @@ LL + foo::<u64>(42_u64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u64.rs:61:16
--> $DIR/numeric-suffix-u64.rs:50:16
|
LL | foo::<u64>(42_i8);
| ---------- ^^^^^ expected `u64`, found `i8`
@ -170,7 +170,7 @@ LL + foo::<u64>(42_u64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u64.rs:65:16
--> $DIR/numeric-suffix-u64.rs:54:16
|
LL | foo::<u64>(42.0_f64);
| ---------- ^^^^^^^^ expected `u64`, found `f64`
@ -189,7 +189,7 @@ LL + foo::<u64>(42u64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-u64.rs:69:16
--> $DIR/numeric-suffix-u64.rs:58:16
|
LL | foo::<u64>(42.0_f32);
| ---------- ^^^^^^^^ expected `u64`, found `f32`

11
tests/ui/numeric/numeric-suffix/numeric-suffix-usize.fixed
View file

@ -12,17 +12,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<usize>(42_usize);

11
tests/ui/numeric/numeric-suffix/numeric-suffix-usize.rs
View file

@ -12,17 +12,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<usize>(42_usize);

22
tests/ui/numeric/numeric-suffix/numeric-suffix-usize.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/numeric-suffix-usize.rs:29:18
--> $DIR/numeric-suffix-usize.rs:18:18
|
LL | foo::<usize>(42_u64);
| ------------ ^^^^^^ expected `usize`, found `u64`
@ -18,7 +18,7 @@ LL + foo::<usize>(42_usize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-usize.rs:33:18
--> $DIR/numeric-suffix-usize.rs:22:18
|
LL | foo::<usize>(42_u32);
| ------------ ^^^^^^ expected `usize`, found `u32`
@ -37,7 +37,7 @@ LL + foo::<usize>(42_usize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-usize.rs:37:18
--> $DIR/numeric-suffix-usize.rs:26:18
|
LL | foo::<usize>(42_u16);
| ------------ ^^^^^^ expected `usize`, found `u16`
@ -56,7 +56,7 @@ LL + foo::<usize>(42_usize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-usize.rs:41:18
--> $DIR/numeric-suffix-usize.rs:30:18
|
LL | foo::<usize>(42_u8);
| ------------ ^^^^^ expected `usize`, found `u8`
@ -75,7 +75,7 @@ LL + foo::<usize>(42_usize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-usize.rs:45:18
--> $DIR/numeric-suffix-usize.rs:34:18
|
LL | foo::<usize>(42_isize);
| ------------ ^^^^^^^^ expected `usize`, found `isize`
@ -94,7 +94,7 @@ LL + foo::<usize>(42_usize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-usize.rs:49:18
--> $DIR/numeric-suffix-usize.rs:38:18
|
LL | foo::<usize>(42_i64);
| ------------ ^^^^^^ expected `usize`, found `i64`
@ -113,7 +113,7 @@ LL + foo::<usize>(42_usize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-usize.rs:53:18
--> $DIR/numeric-suffix-usize.rs:42:18
|
LL | foo::<usize>(42_i32);
| ------------ ^^^^^^ expected `usize`, found `i32`
@ -132,7 +132,7 @@ LL + foo::<usize>(42_usize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-usize.rs:57:18
--> $DIR/numeric-suffix-usize.rs:46:18
|
LL | foo::<usize>(42_i16);
| ------------ ^^^^^^ expected `usize`, found `i16`
@ -151,7 +151,7 @@ LL + foo::<usize>(42_usize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-usize.rs:61:18
--> $DIR/numeric-suffix-usize.rs:50:18
|
LL | foo::<usize>(42_i8);
| ------------ ^^^^^ expected `usize`, found `i8`
@ -170,7 +170,7 @@ LL + foo::<usize>(42_usize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-usize.rs:65:18
--> $DIR/numeric-suffix-usize.rs:54:18
|
LL | foo::<usize>(42.0_f64);
| ------------ ^^^^^^^^ expected `usize`, found `f64`
@ -189,7 +189,7 @@ LL + foo::<usize>(42usize);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix-usize.rs:69:18
--> $DIR/numeric-suffix-usize.rs:58:18
|
LL | foo::<usize>(42.0_f32);
| ------------ ^^^^^^^^ expected `usize`, found `f32`

69
tests/ui/numeric/numeric-suffix/numeric-suffix.fixed
View file

@ -69,75 +69,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<u16>(42_u16);

69
tests/ui/numeric/numeric-suffix/numeric-suffix.rs
View file

@ -69,75 +69,6 @@ fn foo<N>(_x: N) {}
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE function defined here
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
//~| NOTE
fn main() {
foo::<u16>(42_usize);

136
tests/ui/numeric/numeric-suffix/numeric-suffix.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:143:16
--> $DIR/numeric-suffix.rs:74:16
|
LL | foo::<u16>(42_usize);
| ---------- ^^^^^^^^ expected `u16`, found `usize`
@ -18,7 +18,7 @@ LL + foo::<u16>(42_u16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:147:16
--> $DIR/numeric-suffix.rs:78:16
|
LL | foo::<u16>(42_u64);
| ---------- ^^^^^^ expected `u16`, found `u64`
@ -37,7 +37,7 @@ LL + foo::<u16>(42_u16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:151:16
--> $DIR/numeric-suffix.rs:82:16
|
LL | foo::<u16>(42_u32);
| ---------- ^^^^^^ expected `u16`, found `u32`
@ -56,7 +56,7 @@ LL + foo::<u16>(42_u16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:156:16
--> $DIR/numeric-suffix.rs:87:16
|
LL | foo::<u16>(42_u8);
| ---------- ^^^^^ expected `u16`, found `u8`
@ -75,7 +75,7 @@ LL + foo::<u16>(42_u16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:160:16
--> $DIR/numeric-suffix.rs:91:16
|
LL | foo::<u16>(42_isize);
| ---------- ^^^^^^^^ expected `u16`, found `isize`
@ -94,7 +94,7 @@ LL + foo::<u16>(42_u16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:164:16
--> $DIR/numeric-suffix.rs:95:16
|
LL | foo::<u16>(42_i64);
| ---------- ^^^^^^ expected `u16`, found `i64`
@ -113,7 +113,7 @@ LL + foo::<u16>(42_u16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:168:16
--> $DIR/numeric-suffix.rs:99:16
|
LL | foo::<u16>(42_i32);
| ---------- ^^^^^^ expected `u16`, found `i32`
@ -132,7 +132,7 @@ LL + foo::<u16>(42_u16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:172:16
--> $DIR/numeric-suffix.rs:103:16
|
LL | foo::<u16>(42_i16);
| ---------- ^^^^^^ expected `u16`, found `i16`
@ -151,7 +151,7 @@ LL + foo::<u16>(42_u16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:176:16
--> $DIR/numeric-suffix.rs:107:16
|
LL | foo::<u16>(42_i8);
| ---------- ^^^^^ expected `u16`, found `i8`
@ -170,7 +170,7 @@ LL + foo::<u16>(42_u16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:180:16
--> $DIR/numeric-suffix.rs:111:16
|
LL | foo::<u16>(42.0_f64);
| ---------- ^^^^^^^^ expected `u16`, found `f64`
@ -189,7 +189,7 @@ LL + foo::<u16>(42u16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:184:16
--> $DIR/numeric-suffix.rs:115:16
|
LL | foo::<u16>(42.0_f32);
| ---------- ^^^^^^^^ expected `u16`, found `f32`
@ -208,7 +208,7 @@ LL + foo::<u16>(42u16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:189:16
--> $DIR/numeric-suffix.rs:120:16
|
LL | foo::<i16>(42_usize);
| ---------- ^^^^^^^^ expected `i16`, found `usize`
@ -227,7 +227,7 @@ LL + foo::<i16>(42_i16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:193:16
--> $DIR/numeric-suffix.rs:124:16
|
LL | foo::<i16>(42_u64);
| ---------- ^^^^^^ expected `i16`, found `u64`
@ -246,7 +246,7 @@ LL + foo::<i16>(42_i16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:197:16
--> $DIR/numeric-suffix.rs:128:16
|
LL | foo::<i16>(42_u32);
| ---------- ^^^^^^ expected `i16`, found `u32`
@ -265,7 +265,7 @@ LL + foo::<i16>(42_i16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:201:16
--> $DIR/numeric-suffix.rs:132:16
|
LL | foo::<i16>(42_u16);
| ---------- ^^^^^^ expected `i16`, found `u16`
@ -284,7 +284,7 @@ LL + foo::<i16>(42_i16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:205:16
--> $DIR/numeric-suffix.rs:136:16
|
LL | foo::<i16>(42_u8);
| ---------- ^^^^^ expected `i16`, found `u8`
@ -303,7 +303,7 @@ LL + foo::<i16>(42_i16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:209:16
--> $DIR/numeric-suffix.rs:140:16
|
LL | foo::<i16>(42_isize);
| ---------- ^^^^^^^^ expected `i16`, found `isize`
@ -322,7 +322,7 @@ LL + foo::<i16>(42_i16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:213:16
--> $DIR/numeric-suffix.rs:144:16
|
LL | foo::<i16>(42_i64);
| ---------- ^^^^^^ expected `i16`, found `i64`
@ -341,7 +341,7 @@ LL + foo::<i16>(42_i16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:217:16
--> $DIR/numeric-suffix.rs:148:16
|
LL | foo::<i16>(42_i32);
| ---------- ^^^^^^ expected `i16`, found `i32`
@ -360,7 +360,7 @@ LL + foo::<i16>(42_i16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:222:16
--> $DIR/numeric-suffix.rs:153:16
|
LL | foo::<i16>(42_i8);
| ---------- ^^^^^ expected `i16`, found `i8`
@ -379,7 +379,7 @@ LL + foo::<i16>(42_i16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:226:16
--> $DIR/numeric-suffix.rs:157:16
|
LL | foo::<i16>(42.0_f64);
| ---------- ^^^^^^^^ expected `i16`, found `f64`
@ -398,7 +398,7 @@ LL + foo::<i16>(42i16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:230:16
--> $DIR/numeric-suffix.rs:161:16
|
LL | foo::<i16>(42.0_f32);
| ---------- ^^^^^^^^ expected `i16`, found `f32`
@ -417,7 +417,7 @@ LL + foo::<i16>(42i16);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:235:15
--> $DIR/numeric-suffix.rs:166:15
|
LL | foo::<u8>(42_usize);
| --------- ^^^^^^^^ expected `u8`, found `usize`
@ -436,7 +436,7 @@ LL + foo::<u8>(42_u8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:239:15
--> $DIR/numeric-suffix.rs:170:15
|
LL | foo::<u8>(42_u64);
| --------- ^^^^^^ expected `u8`, found `u64`
@ -455,7 +455,7 @@ LL + foo::<u8>(42_u8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:243:15
--> $DIR/numeric-suffix.rs:174:15
|
LL | foo::<u8>(42_u32);
| --------- ^^^^^^ expected `u8`, found `u32`
@ -474,7 +474,7 @@ LL + foo::<u8>(42_u8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:247:15
--> $DIR/numeric-suffix.rs:178:15
|
LL | foo::<u8>(42_u16);
| --------- ^^^^^^ expected `u8`, found `u16`
@ -493,7 +493,7 @@ LL + foo::<u8>(42_u8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:252:15
--> $DIR/numeric-suffix.rs:183:15
|
LL | foo::<u8>(42_isize);
| --------- ^^^^^^^^ expected `u8`, found `isize`
@ -512,7 +512,7 @@ LL + foo::<u8>(42_u8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:256:15
--> $DIR/numeric-suffix.rs:187:15
|
LL | foo::<u8>(42_i64);
| --------- ^^^^^^ expected `u8`, found `i64`
@ -531,7 +531,7 @@ LL + foo::<u8>(42_u8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:260:15
--> $DIR/numeric-suffix.rs:191:15
|
LL | foo::<u8>(42_i32);
| --------- ^^^^^^ expected `u8`, found `i32`
@ -550,7 +550,7 @@ LL + foo::<u8>(42_u8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:264:15
--> $DIR/numeric-suffix.rs:195:15
|
LL | foo::<u8>(42_i16);
| --------- ^^^^^^ expected `u8`, found `i16`
@ -569,7 +569,7 @@ LL + foo::<u8>(42_u8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:268:15
--> $DIR/numeric-suffix.rs:199:15
|
LL | foo::<u8>(42_i8);
| --------- ^^^^^ expected `u8`, found `i8`
@ -588,7 +588,7 @@ LL + foo::<u8>(42_u8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:272:15
--> $DIR/numeric-suffix.rs:203:15
|
LL | foo::<u8>(42.0_f64);
| --------- ^^^^^^^^ expected `u8`, found `f64`
@ -607,7 +607,7 @@ LL + foo::<u8>(42u8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:276:15
--> $DIR/numeric-suffix.rs:207:15
|
LL | foo::<u8>(42.0_f32);
| --------- ^^^^^^^^ expected `u8`, found `f32`
@ -626,7 +626,7 @@ LL + foo::<u8>(42u8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:281:15
--> $DIR/numeric-suffix.rs:212:15
|
LL | foo::<i8>(42_usize);
| --------- ^^^^^^^^ expected `i8`, found `usize`
@ -645,7 +645,7 @@ LL + foo::<i8>(42_i8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:285:15
--> $DIR/numeric-suffix.rs:216:15
|
LL | foo::<i8>(42_u64);
| --------- ^^^^^^ expected `i8`, found `u64`
@ -664,7 +664,7 @@ LL + foo::<i8>(42_i8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:289:15
--> $DIR/numeric-suffix.rs:220:15
|
LL | foo::<i8>(42_u32);
| --------- ^^^^^^ expected `i8`, found `u32`
@ -683,7 +683,7 @@ LL + foo::<i8>(42_i8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:293:15
--> $DIR/numeric-suffix.rs:224:15
|
LL | foo::<i8>(42_u16);
| --------- ^^^^^^ expected `i8`, found `u16`
@ -702,7 +702,7 @@ LL + foo::<i8>(42_i8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:297:15
--> $DIR/numeric-suffix.rs:228:15
|
LL | foo::<i8>(42_u8);
| --------- ^^^^^ expected `i8`, found `u8`
@ -721,7 +721,7 @@ LL + foo::<i8>(42_i8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:301:15
--> $DIR/numeric-suffix.rs:232:15
|
LL | foo::<i8>(42_isize);
| --------- ^^^^^^^^ expected `i8`, found `isize`
@ -740,7 +740,7 @@ LL + foo::<i8>(42_i8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:305:15
--> $DIR/numeric-suffix.rs:236:15
|
LL | foo::<i8>(42_i64);
| --------- ^^^^^^ expected `i8`, found `i64`
@ -759,7 +759,7 @@ LL + foo::<i8>(42_i8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:309:15
--> $DIR/numeric-suffix.rs:240:15
|
LL | foo::<i8>(42_i32);
| --------- ^^^^^^ expected `i8`, found `i32`
@ -778,7 +778,7 @@ LL + foo::<i8>(42_i8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:313:15
--> $DIR/numeric-suffix.rs:244:15
|
LL | foo::<i8>(42_i16);
| --------- ^^^^^^ expected `i8`, found `i16`
@ -797,7 +797,7 @@ LL + foo::<i8>(42_i8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:318:15
--> $DIR/numeric-suffix.rs:249:15
|
LL | foo::<i8>(42.0_f64);
| --------- ^^^^^^^^ expected `i8`, found `f64`
@ -816,7 +816,7 @@ LL + foo::<i8>(42i8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:322:15
--> $DIR/numeric-suffix.rs:253:15
|
LL | foo::<i8>(42.0_f32);
| --------- ^^^^^^^^ expected `i8`, found `f32`
@ -835,7 +835,7 @@ LL + foo::<i8>(42i8);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:327:16
--> $DIR/numeric-suffix.rs:258:16
|
LL | foo::<f64>(42_usize);
| ---------- ^^^^^^^^ expected `f64`, found `usize`
@ -854,7 +854,7 @@ LL + foo::<f64>(42_f64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:331:16
--> $DIR/numeric-suffix.rs:262:16
|
LL | foo::<f64>(42_u64);
| ---------- ^^^^^^ expected `f64`, found `u64`
@ -873,7 +873,7 @@ LL + foo::<f64>(42_f64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:335:16
--> $DIR/numeric-suffix.rs:266:16
|
LL | foo::<f64>(42_u32);
| ---------- ^^^^^^ expected `f64`, found `u32`
@ -891,7 +891,7 @@ LL | foo::<f64>(42_u32.into());
| +++++++
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:339:16
--> $DIR/numeric-suffix.rs:270:16
|
LL | foo::<f64>(42_u16);
| ---------- ^^^^^^ expected `f64`, found `u16`
@ -909,7 +909,7 @@ LL | foo::<f64>(42_u16.into());
| +++++++
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:343:16
--> $DIR/numeric-suffix.rs:274:16
|
LL | foo::<f64>(42_u8);
| ---------- ^^^^^ expected `f64`, found `u8`
@ -927,7 +927,7 @@ LL | foo::<f64>(42_u8.into());
| +++++++
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:347:16
--> $DIR/numeric-suffix.rs:278:16
|
LL | foo::<f64>(42_isize);
| ---------- ^^^^^^^^ expected `f64`, found `isize`
@ -946,7 +946,7 @@ LL + foo::<f64>(42_f64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:351:16
--> $DIR/numeric-suffix.rs:282:16
|
LL | foo::<f64>(42_i64);
| ---------- ^^^^^^ expected `f64`, found `i64`
@ -965,7 +965,7 @@ LL + foo::<f64>(42_f64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:355:16
--> $DIR/numeric-suffix.rs:286:16
|
LL | foo::<f64>(42_i32);
| ---------- ^^^^^^ expected `f64`, found `i32`
@ -983,7 +983,7 @@ LL | foo::<f64>(42_i32.into());
| +++++++
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:359:16
--> $DIR/numeric-suffix.rs:290:16
|
LL | foo::<f64>(42_i16);
| ---------- ^^^^^^ expected `f64`, found `i16`
@ -1001,7 +1001,7 @@ LL | foo::<f64>(42_i16.into());
| +++++++
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:363:16
--> $DIR/numeric-suffix.rs:294:16
|
LL | foo::<f64>(42_i8);
| ---------- ^^^^^ expected `f64`, found `i8`
@ -1019,7 +1019,7 @@ LL | foo::<f64>(42_i8.into());
| +++++++
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:368:16
--> $DIR/numeric-suffix.rs:299:16
|
LL | foo::<f64>(42.0_f32);
| ---------- ^^^^^^^^ expected `f64`, found `f32`
@ -1038,7 +1038,7 @@ LL + foo::<f64>(42.0_f64);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:373:16
--> $DIR/numeric-suffix.rs:304:16
|
LL | foo::<f32>(42_usize);
| ---------- ^^^^^^^^ expected `f32`, found `usize`
@ -1057,7 +1057,7 @@ LL + foo::<f32>(42_f32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:377:16
--> $DIR/numeric-suffix.rs:308:16
|
LL | foo::<f32>(42_u64);
| ---------- ^^^^^^ expected `f32`, found `u64`
@ -1076,7 +1076,7 @@ LL + foo::<f32>(42_f32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:381:16
--> $DIR/numeric-suffix.rs:312:16
|
LL | foo::<f32>(42_u32);
| ---------- ^^^^^^ expected `f32`, found `u32`
@ -1095,7 +1095,7 @@ LL + foo::<f32>(42_f32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:385:16
--> $DIR/numeric-suffix.rs:316:16
|
LL | foo::<f32>(42_u16);
| ---------- ^^^^^^ expected `f32`, found `u16`
@ -1113,7 +1113,7 @@ LL | foo::<f32>(42_u16.into());
| +++++++
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:389:16
--> $DIR/numeric-suffix.rs:320:16
|
LL | foo::<f32>(42_u8);
| ---------- ^^^^^ expected `f32`, found `u8`
@ -1131,7 +1131,7 @@ LL | foo::<f32>(42_u8.into());
| +++++++
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:393:16
--> $DIR/numeric-suffix.rs:324:16
|
LL | foo::<f32>(42_isize);
| ---------- ^^^^^^^^ expected `f32`, found `isize`
@ -1150,7 +1150,7 @@ LL + foo::<f32>(42_f32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:397:16
--> $DIR/numeric-suffix.rs:328:16
|
LL | foo::<f32>(42_i64);
| ---------- ^^^^^^ expected `f32`, found `i64`
@ -1169,7 +1169,7 @@ LL + foo::<f32>(42_f32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:401:16
--> $DIR/numeric-suffix.rs:332:16
|
LL | foo::<f32>(42_i32);
| ---------- ^^^^^^ expected `f32`, found `i32`
@ -1188,7 +1188,7 @@ LL + foo::<f32>(42_f32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:405:16
--> $DIR/numeric-suffix.rs:336:16
|
LL | foo::<f32>(42_i16);
| ---------- ^^^^^^ expected `f32`, found `i16`
@ -1206,7 +1206,7 @@ LL | foo::<f32>(42_i16.into());
| +++++++
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:409:16
--> $DIR/numeric-suffix.rs:340:16
|
LL | foo::<f32>(42_i8);
| ---------- ^^^^^ expected `f32`, found `i8`
@ -1224,7 +1224,7 @@ LL | foo::<f32>(42_i8.into());
| +++++++
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:413:16
--> $DIR/numeric-suffix.rs:344:16
|
LL | foo::<f32>(42.0_f64);
| ---------- ^^^^^^^^ expected `f32`, found `f64`
@ -1243,7 +1243,7 @@ LL + foo::<f32>(42.0_f32);
|
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:419:16
--> $DIR/numeric-suffix.rs:350:16
|
LL | foo::<u32>(42_u8 as u16);
| ---------- ^^^^^^^^^^^^ expected `u32`, found `u16`
@ -1261,7 +1261,7 @@ LL | foo::<u32>((42_u8 as u16).into());
| + ++++++++
error[E0308]: mismatched types
--> $DIR/numeric-suffix.rs:423:16
--> $DIR/numeric-suffix.rs:354:16
|
LL | foo::<i32>(-42_i8);
| ---------- ^^^^^^ expected `i32`, found `i8`

3
tests/ui/parser/fn-arg-doc-comment.rs
View file

@ -2,12 +2,10 @@ pub fn f( //~ NOTE function defined here
/// Comment
//~^ ERROR documentation comments cannot be applied to function parameters
//~| NOTE doc comments are not allowed here
//~| NOTE
id: u8,
/// Other
//~^ ERROR documentation comments cannot be applied to function parameters
//~| NOTE doc comments are not allowed here
//~| NOTE
a: u8,
) {}
@ -15,7 +13,6 @@ fn bar(id: #[allow(dead_code)] i32) {}
//~^ ERROR attributes cannot be applied to a function parameter's type
//~| NOTE attributes are not allowed here
//~| NOTE function defined here
//~| NOTE
fn main() {
// verify that the parser recovered and properly typechecked the args

10
tests/ui/parser/fn-arg-doc-comment.stderr
View file

@ -1,5 +1,5 @@
error: attributes cannot be applied to a function parameter's type
--> $DIR/fn-arg-doc-comment.rs:14:12
--> $DIR/fn-arg-doc-comment.rs:12:12
|
LL | fn bar(id: #[allow(dead_code)] i32) {}
| ^^^^^^^^^^^^^^^^^^^ attributes are not allowed here
@ -11,13 +11,13 @@ LL | /// Comment
| ^^^^^^^^^^^ doc comments are not allowed here
error: documentation comments cannot be applied to function parameters
--> $DIR/fn-arg-doc-comment.rs:7:5
--> $DIR/fn-arg-doc-comment.rs:6:5
|
LL | /// Other
| ^^^^^^^^^ doc comments are not allowed here
error[E0308]: arguments to this function are incorrect
--> $DIR/fn-arg-doc-comment.rs:22:5
--> $DIR/fn-arg-doc-comment.rs:19:5
|
LL | f("", "");
| ^ -- -- expected `u8`, found `&str`
@ -39,7 +39,7 @@ LL | | a: u8,
| |_________-
error[E0308]: mismatched types
--> $DIR/fn-arg-doc-comment.rs:26:9
--> $DIR/fn-arg-doc-comment.rs:23:9
|
LL | bar("");
| --- ^^ expected `i32`, found `&str`
@ -47,7 +47,7 @@ LL | bar("");
| arguments to this function are incorrect
|
note: function defined here
--> $DIR/fn-arg-doc-comment.rs:14:4
--> $DIR/fn-arg-doc-comment.rs:12:4
|
LL | fn bar(id: #[allow(dead_code)] i32) {}
| ^^^ ---------------------------

1
tests/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs
View file

@ -10,6 +10,5 @@ const async const fn test() {}
//~| ERROR functions cannot be both `const` and `async`
//~| NOTE `const` because of this
//~| NOTE `async` because of this
//~| NOTE
fn main() {}

1
tests/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs
View file

@ -15,6 +15,5 @@ async unsafe const fn test() {}
//~| ERROR functions cannot be both `const` and `async`
//~| NOTE `const` because of this
//~| NOTE `async` because of this
//~| NOTE
fn main() {}

1
tests/ui/pattern/usefulness/issue-78123-non-exhaustive-reference.rs
View file

@ -1,6 +1,5 @@
enum A {}
//~^ NOTE `A` defined here
//~| NOTE
fn f(a: &A) {
match a {}

2
tests/ui/pattern/usefulness/issue-78123-non-exhaustive-reference.stderr
View file

@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: type `&A` is non-empty
--> $DIR/issue-78123-non-exhaustive-reference.rs:6:11
--> $DIR/issue-78123-non-exhaustive-reference.rs:5:11
|
LL | match a {}
| ^

1
tests/ui/type/type-check/point-at-inference-4.rs
View file

@ -3,7 +3,6 @@ struct S<A, B>(Option<(A, B)>);
impl<A, B> S<A, B> {
fn infer(&self, a: A, b: B) {}
//~^ NOTE method defined here
//~| NOTE
}
fn main() {

4
tests/ui/type/type-check/point-at-inference-4.stderr
View file

@ -1,5 +1,5 @@
error[E0061]: this method takes 2 arguments but 1 argument was supplied
--> $DIR/point-at-inference-4.rs:11:7
--> $DIR/point-at-inference-4.rs:10:7
|
LL | s.infer(0i32);
| ^^^^^------ argument #2 is missing
@ -15,7 +15,7 @@ LL | s.infer(0i32, /* b */);
| +++++++++
error[E0308]: mismatched types
--> $DIR/point-at-inference-4.rs:18:24
--> $DIR/point-at-inference-4.rs:17:24
|
LL | s.infer(0i32);
| - ---- this argument has type `i32`...