Skip to content

Commit c9ead84

Browse files
committed
Update tests to match the messages
1 parent d54cafb commit c9ead84

8 files changed

+9
-30
lines changed

src/test/compile-fail/dupe-symbols-1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ pub fn a() {
1717

1818
#[export_name="fail"]
1919
pub fn b() {
20-
//~^ symbol `fail` already exists
20+
//~^ symbol `fail` is already defined
2121
}

src/test/compile-fail/dupe-symbols-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ mod a {
2020
mod b {
2121
#[no_mangle]
2222
pub extern fn fail() {
23-
//~^ symbol `fail` already exists
23+
//~^ symbol `fail` is already defined
2424
}
2525
}

src/test/compile-fail/dupe-symbols-3.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ pub fn a() {
1717

1818
#[no_mangle]
1919
pub fn fail() {
20-
//~^ symbol `fail` already exists
20+
//~^ symbol `fail` is already defined
2121
}

src/test/compile-fail/dupe-symbols-4.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ impl A for B {
2727
impl A for C {
2828
#[no_mangle]
2929
fn fail(self) {}
30-
//~^ symbol `fail` already exists
30+
//~^ symbol `fail` is already defined
3131
}

src/test/compile-fail/dupe-symbols-5.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ static HELLO: u8 = 0;
1616

1717
#[export_name="fail"]
1818
pub fn b() {
19-
//~^ symbol `fail` already exists
19+
//~^ symbol `fail` is already defined
2020
}

src/test/compile-fail/dupe-symbols-6.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ static HELLO: u8 = 0;
1515

1616
#[export_name="fail"]
1717
static HELLO_TWICE: u16 = 0;
18-
//~^ symbol `fail` already exists
18+
//~^ symbol `fail` is already defined

src/test/compile-fail/dupe-symbols-7.rs

+3-9
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010
//
11-
#![crate_type="rlib"]
11+
// error-pattern: entry symbol `main` defined multiple times
1212
#![allow(warnings)]
1313

14-
extern {
15-
fn fail();
16-
}
17-
18-
#[export_name="fail"]
19-
pub fn a() {
20-
//~^ symbol `fail` already exists
21-
}
14+
#[no_mangle]
15+
fn main(){}

src/test/compile-fail/dupe-symbols-8.rs

-15
This file was deleted.

0 commit comments

Comments
 (0)