Skip to content

Commit d0566d6

Browse files
committed
Fix fallout in tests
1 parent b20d567 commit d0566d6

24 files changed

+46
-68
lines changed

src/test/auxiliary/ambig_impl_2_lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
trait me {
11+
pub trait me {
1212
fn me(&self) -> usize;
1313
}
1414
impl me for usize { fn me(&self) -> usize { *self } }

src/test/auxiliary/struct_field_privacy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
struct A {
11+
pub struct A {
1212
a: isize,
1313
pub b: isize,
1414
}

src/test/compile-fail/blind-item-block-middle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
mod foo { struct bar; }
11+
mod foo { pub struct bar; }
1212

1313
fn main() {
1414
let bar = 5;

src/test/compile-fail/const-pattern-irrefutable.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// except according to those terms.
1010

1111
mod foo {
12-
const b: u8 = 2; //~ NOTE constant defined here
13-
const d: u8 = 2; //~ NOTE constant defined here
12+
pub const b: u8 = 2; //~ NOTE constant defined here
13+
pub const d: u8 = 2; //~ NOTE constant defined here
1414
}
1515

1616
use foo::b as c; //~ NOTE constant imported here

src/test/compile-fail/double-import.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
// when reporting the error.
1515

1616
mod sub1 {
17-
fn foo() {} // implementation 1
17+
pub fn foo() {} // implementation 1
1818
}
1919

2020
mod sub2 {
21-
fn foo() {} // implementation 2
21+
pub fn foo() {} // implementation 2
2222
}
2323

2424
use sub1::foo; //~ NOTE previous import of `foo` here

src/test/compile-fail/export-tag-variant.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ mod foo {
1414
enum y { y1, }
1515
}
1616

17-
fn main() { let z = foo::y::y1; } //~ ERROR: is inaccessible
17+
fn main() { let z = foo::y::y1; } //~ ERROR: enum `y` is private

src/test/compile-fail/issue-11680.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ extern crate issue_11680 as other;
1414

1515
fn main() {
1616
let _b = other::Foo::Bar(1);
17-
//~^ ERROR: variant `Bar` is private
17+
//~^ ERROR: enum `Foo` is private
1818

1919
let _b = other::test::Foo::Bar(1);
20-
//~^ ERROR: variant `Bar` is private
20+
//~^ ERROR: enum `Foo` is private
2121
}

src/test/compile-fail/issue-13407.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ fn main() {
1616
A::C = 1;
1717
//~^ ERROR: invalid left-hand side expression
1818
//~| ERROR: mismatched types
19+
//~| ERROR: struct `C` is private
1920
}

src/test/compile-fail/issue-13641.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ mod a {
1717

1818
fn main() {
1919
a::Foo::new();
20-
//~^ ERROR: method `new` is inaccessible
21-
//~^^ NOTE: struct `Foo` is private
20+
//~^ ERROR: struct `Foo` is private
2221
a::Bar::new();
23-
//~^ ERROR: method `new` is inaccessible
24-
//~^^ NOTE: enum `Bar` is private
22+
//~^ ERROR: enum `Bar` is private
2523
}

src/test/compile-fail/issue-16538.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
// except according to those terms.
1010

1111
mod Y {
12-
type X = usize;
12+
pub type X = usize;
1313
extern {
14-
static x: *const usize;
14+
pub static x: *const usize;
1515
}
16-
fn foo(value: *const X) -> *const X {
16+
pub fn foo(value: *const X) -> *const X {
1717
value
1818
}
1919
}

0 commit comments

Comments
 (0)