Skip to content

Commit e1d0de8

Browse files
borsbors
authored
Auto merge of rust-lang#36274 - Manishearth:rollup, r=Manishearth
Rollup of 6 pull requests - Successful merges: rust-lang#35845, rust-lang#35983, rust-lang#36065, rust-lang#36102, rust-lang#36242, rust-lang#36245 - Failed merges:
2 parents cbe4de7 + 20ec61e commit e1d0de8

18 files changed

+100
-76
lines changed

‎src/librustc/middle/resolve_lifetime.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,9 @@ fn signal_shadowing_problem(sess: &Session, name: ast::Name, orig: Original, sha
396396
{} name that is already in scope",
397397
shadower.kind.desc(), name, orig.kind.desc()))
398398
};
399-
err.span_note(orig.span,
400-
&format!("shadowed {} `{}` declared here",
401-
orig.kind.desc(), name));
399+
err.span_label(orig.span, &"first declared here");
400+
err.span_label(shadower.span,
401+
&format!("lifetime {} already in scope", name));
402402
err.emit();
403403
}
404404

‎src/librustc_typeck/check/mod.rs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2437,16 +2437,18 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
24372437
if arg_count == 1 {" was"} else {"s were"}),
24382438
error_code);
24392439

2440-
err.span_label(sp, &format!("expected {}{} parameter{}",
2441-
if variadic {"at least "} else {""},
2442-
expected_count,
2443-
if expected_count == 1 {""} else {"s"}));
2444-
24452440
let input_types = fn_inputs.iter().map(|i| format!("{:?}", i)).collect::<Vec<String>>();
2446-
if input_types.len() > 0 {
2447-
err.note(&format!("the following parameter type{} expected: {}",
2448-
if expected_count == 1 {" was"} else {"s were"},
2449-
input_types.join(", ")));
2441+
if input_types.len() > 1 {
2442+
err.note("the following parameter types were expected:");
2443+
err.note(&input_types.join(", "));
2444+
} else if input_types.len() > 0 {
2445+
err.note(&format!("the following parameter type was expected: {}",
2446+
input_types[0]));
2447+
} else {
2448+
err.span_label(sp, &format!("expected {}{} parameter{}",
2449+
if variadic {"at least "} else {""},
2450+
expected_count,
2451+
if expected_count == 1 {""} else {"s"}));
24502452
}
24512453
err.emit();
24522454
}

‎src/libsyntax/feature_gate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ declare_features! (
308308
(removed, struct_inherit, "1.0.0", None),
309309
(removed, test_removed_feature, "1.0.0", None),
310310
(removed, visible_private_types, "1.0.0", None),
311+
(removed, unsafe_no_drop_flag, "1.0.0", None),
311312
);
312313

313314
declare_features! (

‎src/test/compile-fail/E0060.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@ extern "C" {
1515
fn main() {
1616
unsafe { printf(); }
1717
//~^ ERROR E0060
18-
//~| NOTE expected at least 1 parameter
19-
//~| NOTE the following parameter type was expected
18+
//~| NOTE the following parameter type was expected: *const u8
2019
}

‎src/test/compile-fail/E0061.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@
1010

1111
fn f(a: u16, b: &str) {}
1212

13+
fn f2(a: u16) {}
14+
1315
fn main() {
1416
f(0);
1517
//~^ ERROR E0061
16-
//~| NOTE expected 2 parameters
17-
//~| NOTE the following parameter types were expected
18+
//~| NOTE the following parameter types were expected:
19+
//~| NOTE u16, &str
20+
21+
f2();
22+
//~^ ERROR E0061
23+
//~| NOTE the following parameter type was expected: u16
1824
}

‎src/test/compile-fail/E0496.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ struct Foo<'a> {
1313
}
1414

1515
impl<'a> Foo<'a> {
16+
//~^ NOTE first declared here
1617
fn f<'a>(x: &'a i32) { //~ ERROR E0496
18+
//~^ NOTE lifetime 'a already in scope
1719
}
1820
}
1921

‎src/test/compile-fail/issue-18819.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ fn print_x(_: &Foo<Item=bool>, extra: &str) {
2525
fn main() {
2626
print_x(X);
2727
//~^ ERROR this function takes 2 parameters but 1 parameter was supplied
28-
//~| NOTE the following parameter types were expected: &Foo<Item=bool>, &str
29-
//~| NOTE expected 2 parameters
28+
//~| NOTE the following parameter types were expected:
29+
//~| NOTE &Foo<Item=bool>, &str
3030
}

‎src/test/compile-fail/issue-3044.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ fn main() {
1515
});
1616
//~^^ ERROR this function takes 2 parameters but 1 parameter was supplied
1717
//~| NOTE the following parameter types were expected
18-
//~| NOTE expected 2 parameters
18+
//~| NOTE _, _
1919
// the first error is, um, non-ideal.
2020
}

‎src/test/compile-fail/issue-4935.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ fn foo(a: usize) {}
1414
fn main() { foo(5, 6) }
1515
//~^ ERROR this function takes 1 parameter but 2 parameters were supplied
1616
//~| NOTE the following parameter type was expected
17-
//~| NOTE expected 1 parameter

‎src/test/compile-fail/loops-reject-duplicate-labels-2.rs

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,31 @@
1919
// https://internals.rust-lang.org/t/psa-rejecting-duplicate-loop-labels/1833
2020

2121
pub fn foo() {
22-
{ 'fl: for _ in 0..10 { break; } } //~ NOTE shadowed label `'fl` declared here
22+
{ 'fl: for _ in 0..10 { break; } } //~ NOTE first declared here
2323
{ 'fl: loop { break; } } //~ WARN label name `'fl` shadows a label name that is already in scope
24-
25-
{ 'lf: loop { break; } } //~ NOTE shadowed label `'lf` declared here
24+
//~^ NOTE lifetime 'fl already in scope
25+
{ 'lf: loop { break; } } //~ NOTE first declared here
2626
{ 'lf: for _ in 0..10 { break; } } //~ WARN label name `'lf` shadows a label name that is already in scope
27-
28-
{ 'wl: while 2 > 1 { break; } } //~ NOTE shadowed label `'wl` declared here
27+
//~^ NOTE lifetime 'lf already in scope
28+
{ 'wl: while 2 > 1 { break; } } //~ NOTE first declared here
2929
{ 'wl: loop { break; } } //~ WARN label name `'wl` shadows a label name that is already in scope
30-
31-
{ 'lw: loop { break; } } //~ NOTE shadowed label `'lw` declared here
30+
//~^ NOTE lifetime 'wl already in scope
31+
{ 'lw: loop { break; } } //~ NOTE first declared here
3232
{ 'lw: while 2 > 1 { break; } } //~ WARN label name `'lw` shadows a label name that is already in scope
33-
34-
{ 'fw: for _ in 0..10 { break; } } //~ NOTE shadowed label `'fw` declared here
33+
//~^ NOTE lifetime 'lw already in scope
34+
{ 'fw: for _ in 0..10 { break; } } //~ NOTE first declared here
3535
{ 'fw: while 2 > 1 { break; } } //~ WARN label name `'fw` shadows a label name that is already in scope
36-
37-
{ 'wf: while 2 > 1 { break; } } //~ NOTE shadowed label `'wf` declared here
36+
//~^ NOTE lifetime 'fw already in scope
37+
{ 'wf: while 2 > 1 { break; } } //~ NOTE first declared here
3838
{ 'wf: for _ in 0..10 { break; } } //~ WARN label name `'wf` shadows a label name that is already in scope
39-
40-
{ 'tl: while let Some(_) = None::<i32> { break; } } //~ NOTE shadowed label `'tl` declared here
39+
//~^ NOTE lifetime 'wf already in scope
40+
{ 'tl: while let Some(_) = None::<i32> { break; } } //~ NOTE first declared here
4141
{ 'tl: loop { break; } } //~ WARN label name `'tl` shadows a label name that is already in scope
42-
43-
{ 'lt: loop { break; } } //~ NOTE shadowed label `'lt` declared here
42+
//~^ NOTE lifetime 'tl already in scope
43+
{ 'lt: loop { break; } } //~ NOTE first declared here
4444
{ 'lt: while let Some(_) = None::<i32> { break; } }
45-
//~^ WARN label name `'lt` shadows a label name that is already in scope
45+
//~^ WARN label name `'lt` shadows a label name that is already in scope
46+
//~| NOTE lifetime 'lt already in scope
4647
}
4748

4849
#[rustc_error]

‎src/test/compile-fail/loops-reject-duplicate-labels.rs

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,32 @@
1616
// This is testing the exact cases that are in the issue description.
1717

1818
fn foo() {
19-
'fl: for _ in 0..10 { break; } //~ NOTE shadowed label `'fl` declared here
19+
'fl: for _ in 0..10 { break; } //~ NOTE first declared here
2020
'fl: loop { break; } //~ WARN label name `'fl` shadows a label name that is already in scope
21+
//~^ NOTE lifetime 'fl already in scope
2122

22-
'lf: loop { break; } //~ NOTE shadowed label `'lf` declared here
23+
'lf: loop { break; } //~ NOTE first declared here
2324
'lf: for _ in 0..10 { break; } //~ WARN label name `'lf` shadows a label name that is already in scope
24-
25-
'wl: while 2 > 1 { break; } //~ NOTE shadowed label `'wl` declared here
25+
//~^ NOTE lifetime 'lf already in scope
26+
'wl: while 2 > 1 { break; } //~ NOTE first declared here
2627
'wl: loop { break; } //~ WARN label name `'wl` shadows a label name that is already in scope
27-
28-
'lw: loop { break; } //~ NOTE shadowed label `'lw` declared here
28+
//~^ NOTE lifetime 'wl already in scope
29+
'lw: loop { break; } //~ NOTE first declared here
2930
'lw: while 2 > 1 { break; } //~ WARN label name `'lw` shadows a label name that is already in scope
30-
31-
'fw: for _ in 0..10 { break; } //~ NOTE shadowed label `'fw` declared here
31+
//~^ NOTE lifetime 'lw already in scope
32+
'fw: for _ in 0..10 { break; } //~ NOTE first declared here
3233
'fw: while 2 > 1 { break; } //~ WARN label name `'fw` shadows a label name that is already in scope
33-
34-
'wf: while 2 > 1 { break; } //~ NOTE shadowed label `'wf` declared here
34+
//~^ NOTE lifetime 'fw already in scope
35+
'wf: while 2 > 1 { break; } //~ NOTE first declared here
3536
'wf: for _ in 0..10 { break; } //~ WARN label name `'wf` shadows a label name that is already in scope
36-
37-
'tl: while let Some(_) = None::<i32> { break; } //~ NOTE shadowed label `'tl` declared here
37+
//~^ NOTE lifetime 'wf already in scope
38+
'tl: while let Some(_) = None::<i32> { break; } //~ NOTE first declared here
3839
'tl: loop { break; } //~ WARN label name `'tl` shadows a label name that is already in scope
39-
40-
'lt: loop { break; } //~ NOTE shadowed label `'lt` declared here
40+
//~^ NOTE lifetime 'tl already in scope
41+
'lt: loop { break; } //~ NOTE first declared here
4142
'lt: while let Some(_) = None::<i32> { break; }
42-
//~^ WARN label name `'lt` shadows a label name that is already in scope
43+
//~^ WARN label name `'lt` shadows a label name that is already in scope
44+
//~| NOTE lifetime 'lt already in scope
4345
}
4446

4547
// Note however that it is okay for the same label to be reused in

‎src/test/compile-fail/loops-reject-labels-shadowing-lifetimes.rs

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
#![allow(dead_code, unused_variables)]
1717

1818
fn foo() {
19-
fn foo<'a>() { //~ NOTE shadowed lifetime `'a` declared here
19+
fn foo<'a>() { //~ NOTE first declared here
2020
'a: loop { break 'a; }
2121
//~^ WARN label name `'a` shadows a lifetime name that is already in scope
22+
//~| NOTE lifetime 'a already in scope
2223
}
2324

2425
struct Struct<'b, 'c> { _f: &'b i8, _g: &'c i8 }
@@ -40,76 +41,87 @@ fn foo() {
4041
}
4142
}
4243

43-
impl<'bad, 'c> Struct<'bad, 'c> { //~ NOTE shadowed lifetime `'bad` declared here
44+
impl<'bad, 'c> Struct<'bad, 'c> { //~ NOTE first declared here
4445
fn meth_bad(&self) {
4546
'bad: loop { break 'bad; }
4647
//~^ WARN label name `'bad` shadows a lifetime name that is already in scope
48+
//~| NOTE lifetime 'bad already in scope
4749
}
4850
}
4951

50-
impl<'b, 'bad> Struct<'b, 'bad> { //~ NOTE shadowed lifetime `'bad` declared here
52+
impl<'b, 'bad> Struct<'b, 'bad> { //~ NOTE first declared here
5153
fn meth_bad2(&self) {
5254
'bad: loop { break 'bad; }
5355
//~^ WARN label name `'bad` shadows a lifetime name that is already in scope
56+
//~| NOTE lifetime 'bad already in scope
5457
}
5558
}
5659

5760
impl<'b, 'c> Struct<'b, 'c> {
58-
fn meth_bad3<'bad>(x: &'bad i8) { //~ NOTE shadowed lifetime `'bad` declared here
61+
fn meth_bad3<'bad>(x: &'bad i8) { //~ NOTE first declared here
5962
'bad: loop { break 'bad; }
6063
//~^ WARN label name `'bad` shadows a lifetime name that is already in scope
64+
//~| NOTE lifetime 'bad already in scope
6165
}
6266

6367
fn meth_bad4<'a,'bad>(x: &'a i8, y: &'bad i8) {
64-
//~^ NOTE shadowed lifetime `'bad` declared here
68+
//~^ NOTE first declared here
6569
'bad: loop { break 'bad; }
6670
//~^ WARN label name `'bad` shadows a lifetime name that is already in scope
71+
//~| NOTE lifetime 'bad already in scope
6772
}
6873
}
6974

70-
impl <'bad, 'e> Enum<'bad, 'e> { //~ NOTE shadowed lifetime `'bad` declared here
75+
impl <'bad, 'e> Enum<'bad, 'e> { //~ NOTE first declared here
7176
fn meth_bad(&self) {
7277
'bad: loop { break 'bad; }
7378
//~^ WARN label name `'bad` shadows a lifetime name that is already in scope
79+
//~| NOTE lifetime 'bad already in scope
7480
}
7581
}
76-
impl <'d, 'bad> Enum<'d, 'bad> { //~ NOTE shadowed lifetime `'bad` declared here
82+
impl <'d, 'bad> Enum<'d, 'bad> { //~ NOTE first declared here
7783
fn meth_bad2(&self) {
7884
'bad: loop { break 'bad; }
7985
//~^ WARN label name `'bad` shadows a lifetime name that is already in scope
86+
//~| NOTE lifetime 'bad already in scope
8087
}
8188
}
8289
impl <'d, 'e> Enum<'d, 'e> {
83-
fn meth_bad3<'bad>(x: &'bad i8) { //~ NOTE shadowed lifetime `'bad` declared here
90+
fn meth_bad3<'bad>(x: &'bad i8) { //~ NOTE first declared here
8491
'bad: loop { break 'bad; }
8592
//~^ WARN label name `'bad` shadows a lifetime name that is already in scope
93+
//~| NOTE lifetime 'bad already in scope
8694
}
8795

88-
fn meth_bad4<'a,'bad>(x: &'bad i8) { //~ NOTE shadowed lifetime `'bad` declared here
96+
fn meth_bad4<'a,'bad>(x: &'bad i8) { //~ NOTE first declared here
8997
'bad: loop { break 'bad; }
9098
//~^ WARN label name `'bad` shadows a lifetime name that is already in scope
99+
//~| NOTE lifetime 'bad already in scope
91100
}
92101
}
93102

94-
trait HasDefaultMethod1<'bad> { //~ NOTE shadowed lifetime `'bad` declared here
103+
trait HasDefaultMethod1<'bad> { //~ NOTE first declared here
95104
fn meth_okay() {
96105
'c: loop { break 'c; }
97106
}
98107
fn meth_bad(&self) {
99108
'bad: loop { break 'bad; }
100109
//~^ WARN label name `'bad` shadows a lifetime name that is already in scope
110+
//~| NOTE lifetime 'bad already in scope
101111
}
102112
}
103-
trait HasDefaultMethod2<'a,'bad> { //~ NOTE shadowed lifetime `'bad` declared here
113+
trait HasDefaultMethod2<'a,'bad> { //~ NOTE first declared here
104114
fn meth_bad(&self) {
105115
'bad: loop { break 'bad; }
106116
//~^ WARN label name `'bad` shadows a lifetime name that is already in scope
117+
//~| NOTE lifetime 'bad already in scope
107118
}
108119
}
109120
trait HasDefaultMethod3<'a,'b> {
110-
fn meth_bad<'bad>(&self) { //~ NOTE shadowed lifetime `'bad` declared here
121+
fn meth_bad<'bad>(&self) { //~ NOTE first declared here
111122
'bad: loop { break 'bad; }
112123
//~^ WARN label name `'bad` shadows a lifetime name that is already in scope
124+
//~| NOTE lifetime 'bad already in scope
113125
}
114126
}
115127
}

‎src/test/compile-fail/loops-reject-lifetime-shadowing-label.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ fn foo() {
2727

2828
let z = 3_i8;
2929

30-
'a: loop { //~ NOTE shadowed label `'a` declared here
30+
'a: loop { //~ NOTE first declared here
3131
let b = Box::new(|x: &i8| *x) as Box<for <'a> Fn(&'a i8) -> i8>;
3232
//~^ WARN lifetime name `'a` shadows a label name that is already in scope
33+
//~| NOTE lifetime 'a already in scope
3334
assert_eq!((*b)(&z), z);
3435
break 'a;
3536
}

‎src/test/compile-fail/method-call-err-msg.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ fn main() {
2323
//~^ NOTE expected 0 parameters
2424
.one() //~ ERROR this function takes 1 parameter but 0 parameters were supplied
2525
//~^ NOTE the following parameter type was expected
26-
//~| NOTE expected 1 parameter
2726
.two(0); //~ ERROR this function takes 2 parameters but 1 parameter was supplied
2827
//~^ NOTE the following parameter types were expected
29-
//~| NOTE expected 2 parameters
28+
//~| NOTE isize, isize
3029

3130
let y = Foo;
3231
y.zero()

‎src/test/compile-fail/not-enough-arguments.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ fn foo(a: isize, b: isize, c: isize, d:isize) {
1919
fn main() {
2020
foo(1, 2, 3);
2121
//~^ ERROR this function takes 4 parameters but 3
22-
//~| NOTE the following parameter types were expected
23-
//~| NOTE expected 4 parameters
22+
//~| NOTE the following parameter types were expected:
23+
//~| NOTE isize, isize, isize, isize
2424
}

‎src/test/compile-fail/overloaded-calls-bad.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ fn main() {
4242
let ans = s();
4343
//~^ ERROR this function takes 1 parameter but 0 parameters were supplied
4444
//~| NOTE the following parameter type was expected
45-
//~| NOTE expected 1 parameter
4645
let ans = s("burma", "shave");
4746
//~^ ERROR this function takes 1 parameter but 2 parameters were supplied
4847
//~| NOTE the following parameter type was expected
49-
//~| NOTE expected 1 parameter
5048
}

‎src/test/compile-fail/shadowed-lifetime.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,18 @@
1313
struct Foo<'a>(&'a isize);
1414

1515
impl<'a> Foo<'a> {
16-
//~^ NOTE shadowed lifetime `'a` declared here
16+
//~^ NOTE first declared here
1717
fn shadow_in_method<'a>(&'a self) -> &'a isize {
1818
//~^ ERROR lifetime name `'a` shadows a lifetime name that is already in scope
19+
//~| NOTE lifetime 'a already in scope
1920
self.0
2021
}
2122

2223
fn shadow_in_type<'b>(&'b self) -> &'b isize {
23-
//~^ NOTE shadowed lifetime `'b` declared here
24+
//~^ NOTE first declared here
2425
let x: for<'b> fn(&'b isize) = panic!();
2526
//~^ ERROR lifetime name `'b` shadows a lifetime name that is already in scope
27+
//~| NOTE lifetime 'b already in scope
2628
self.0
2729
}
2830

‎src/test/compile-fail/variadic-ffi-3.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ extern "C" fn bar(f: isize, x: u8) {}
1717
fn main() {
1818
unsafe {
1919
foo(); //~ ERROR: this function takes at least 2 parameters but 0 parameters were supplied
20-
//~^ NOTE the following parameter types were expected
21-
//~| NOTE expected at least 2 parameters
20+
//~^ NOTE the following parameter types were expected:
21+
//~| NOTE isize, u8
2222
foo(1); //~ ERROR: this function takes at least 2 parameters but 1 parameter was supplied
23-
//~^ NOTE the following parameter types were expected
24-
//~| NOTE expected at least 2 parameters
23+
//~^ NOTE the following parameter types were expected:
24+
//~| NOTE isize, u8
2525

2626
let x: unsafe extern "C" fn(f: isize, x: u8) = foo;
2727
//~^ ERROR: mismatched types

0 commit comments

Comments
 (0)