Skip to content

Commit efe56c8

Browse files
committed
Add missings NOTE and HELP annotations to tests
1 parent 36656f8 commit efe56c8

11 files changed

+32
-9
lines changed

src/test/compile-fail/changing-crates.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
extern crate a;
1717
extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
18-
//~^ NOTE: perhaps this crate needs to be recompiled
18+
//~| NOTE: perhaps this crate needs to be recompiled
19+
//~| NOTE: crate `a` path #1:
20+
//~| NOTE: crate `b` path #1:
1921

2022
fn main() {}

src/test/compile-fail/default_ty_param_conflict_cross_crate.rs

+1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ fn main() {
2626
meh(foo);
2727
//~^ ERROR: mismatched types:
2828
//~| NOTE: conflicting type parameter defaults `bool` and `char`
29+
//~| NOTE: ...that was applied to an unconstrained type variable here
2930
}

src/test/compile-fail/lifetime-inference-give-expl-lifetime-param.rs

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ struct Baz<'x> {
4949

5050
impl<'a> Baz<'a> {
5151
fn baz2<'b>(&self, x: &isize) -> (&'b isize, &'b isize) {
52+
//~^ HELP: parameter as shown: fn baz2<'b>(&self, x: &'b isize) -> (&'a isize, &'a isize)
5253
// The lifetime that gets assigned to `x` seems somewhat random.
5354
// I have disabled this test for the time being. --pcwalton
5455
(self.bar, x) //~ ERROR: cannot infer

src/test/compile-fail/privacy1.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,17 @@ mod foo {
129129
::bar::baz::foo(); //~ ERROR: function `foo` is inaccessible
130130
//~^ NOTE: module `baz` is private
131131
::bar::baz::bar(); //~ ERROR: function `bar` is inaccessible
132+
//~^ NOTE: module `baz` is private
132133
}
133134

134135
fn test2() {
135136
use bar::baz::{foo, bar};
136137
//~^ ERROR: function `foo` is inaccessible
137-
//~^^ ERROR: function `bar` is inaccessible
138+
//~| NOTE: module `baz` is private
139+
//~| ERROR: function `bar` is inaccessible
140+
//~| NOTE: module `baz` is private
141+
142+
138143
foo();
139144
bar();
140145
}

src/test/compile-fail/svh-change-lit.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515

1616
extern crate a;
1717
extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
18-
//~^ NOTE: perhaps this crate needs to be recompiled
18+
//~| NOTE: perhaps this crate needs to be recompiled
19+
//~| NOTE: crate `a` path #1:
20+
//~| NOTE: crate `b` path #1:
1921

2022
fn main() {
2123
b::foo()

src/test/compile-fail/svh-change-significant-cfg.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515

1616
extern crate a;
1717
extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
18-
//~^ NOTE: perhaps this crate needs to be recompiled
18+
//~| NOTE: perhaps this crate needs to be recompiled
19+
//~| NOTE: crate `a` path #1:
20+
//~| NOTE: crate `b` path #1:
1921

2022
fn main() {
2123
b::foo()

src/test/compile-fail/svh-change-trait-bound.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515

1616
extern crate a;
1717
extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
18-
//~^ NOTE: perhaps this crate needs to be recompiled
18+
//~| NOTE: perhaps this crate needs to be recompiled
19+
//~| NOTE: crate `a` path #1:
20+
//~| NOTE: crate `b` path #1:
1921

2022
fn main() {
2123
b::foo()

src/test/compile-fail/svh-change-type-arg.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515

1616
extern crate a;
1717
extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
18-
//~^ NOTE: perhaps this crate needs to be recompiled
18+
//~| NOTE: perhaps this crate needs to be recompiled
19+
//~| NOTE: crate `a` path #1:
20+
//~| NOTE: crate `b` path #1:
1921

2022
fn main() {
2123
b::foo()

src/test/compile-fail/svh-change-type-ret.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515

1616
extern crate a;
1717
extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
18-
//~^ NOTE: perhaps this crate needs to be recompiled
18+
//~| NOTE: perhaps this crate needs to be recompiled
19+
//~| NOTE: crate `a` path #1:
20+
//~| NOTE: crate `b` path #1:
1921

2022
fn main() {
2123
b::foo()

src/test/compile-fail/svh-change-type-static.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515

1616
extern crate a;
1717
extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
18-
//~^ NOTE: perhaps this crate needs to be recompiled
18+
//~| NOTE: perhaps this crate needs to be recompiled
19+
//~| NOTE: crate `a` path #1:
20+
//~| NOTE: crate `b` path #1:
1921

2022
fn main() {
2123
b::foo()

src/test/compile-fail/svh-use-trait.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
2121
extern crate uta;
2222
extern crate utb; //~ ERROR: found possibly newer version of crate `uta` which `utb` depends
23-
//~^ NOTE: perhaps this crate needs to be recompiled
23+
//~| NOTE: perhaps this crate needs to be recompiled?
24+
//~| NOTE: crate `uta` path #1:
25+
//~| NOTE: crate `utb` path #1:
2426

2527
fn main() {
2628
utb::foo()

0 commit comments

Comments
 (0)