Skip to content

Commit 812637e

Browse files
committed
test: Fix tests for crate_id removal
This involved removing some tests whose functionality was removed such as many of the crateresolve tests
1 parent cc3c8bb commit 812637e

File tree

47 files changed

+144
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+144
-311
lines changed

src/test/auxiliary/crateresolve1-1.rs

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

11-
#![crate_id="crateresolve1#0.1"]
12-
11+
// compile-flags:-C extra-filename=-1
12+
#![crate_name = "crateresolve1"]
1313
#![crate_type = "lib"]
1414

1515
pub fn f() -> int { 10 }

src/test/auxiliary/crateresolve1-2.rs

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

11-
#![crate_id="crateresolve1#0.2"]
12-
11+
// compile-flags:-C extra-filename=-2
12+
#![crate_name = "crateresolve1"]
1313
#![crate_type = "lib"]
1414

1515
pub fn f() -> int { 20 }

src/test/auxiliary/crateresolve1-3.rs

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

11-
#![crate_id="crateresolve1#0.3"]
12-
11+
// compile-flags:-C extra-filename=-3
12+
#![crate_name = "crateresolve1"]
1313
#![crate_type = "lib"]
1414

1515
pub fn f() -> int { 30 }

src/test/auxiliary/crateresolve2-1.rs

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/test/auxiliary/extern-crosscrate-source.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-
#![crate_id="externcallback#0.1"]
11+
#![crate_name="externcallback"]
1212
#![crate_type = "lib"]
1313

1414
extern crate libc;

src/test/compile-fail/bad-crate-id.rs

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

11-
extern crate foo = ""; //~ ERROR: malformed crate id
12-
extern crate bar = "#a"; //~ ERROR: malformed crate id
11+
extern crate foo = ""; //~ ERROR: crate name must not be empty
1312

1413
fn main() {}
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,8 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![crate_id="crateresolve2#0.2"]
11+
extern crate bar = "#a"; //~ ERROR: invalid character in crate name: `#`
1212

13-
#![crate_type = "lib"]
13+
fn main() {}
1414

15-
pub fn f() -> int { 20 }

src/test/compile-fail/crateresolve2.rs

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/test/compile-fail/crateresolve5.rs

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/test/compile-fail/issue-11908-1.rs

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)