Skip to content

Commit e77db16

Browse files
alexcrichtonalexcrichton
committed
Fix fallout of removing quotes in crate names
1 parent 8bc3838 commit e77db16

Some content is hidden

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

70 files changed

+195
-204
lines changed

‎src/test/auxiliary/issue-12133-dylib2.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212

1313
#![crate_type = "dylib"]
1414

15-
extern crate "issue-12133-rlib" as a;
16-
extern crate "issue-12133-dylib" as b;
15+
extern crate issue_12133_rlib as a;
16+
extern crate issue_12133_dylib as b;

‎src/test/auxiliary/issue-13560-3.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212

1313
#![crate_type = "rlib"]
1414

15-
#[macro_use] #[no_link] extern crate "issue-13560-1" as t1;
16-
#[macro_use] extern crate "issue-13560-2" as t2;
15+
#[macro_use] #[no_link] extern crate issue_13560_1 as t1;
16+
#[macro_use] extern crate issue_13560_2 as t2;

‎src/test/auxiliary/issue-13620-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
extern crate "issue-13620-1" as crate1;
11+
extern crate issue_13620_1 as crate1;
1212

1313
pub static FOO2: crate1::Foo = crate1::FOO;

‎src/test/auxiliary/issue-13872-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
extern crate "issue-13872-1" as foo;
11+
extern crate issue_13872_1 as foo;
1212

1313
pub use foo::A::B;

‎src/test/auxiliary/issue-13872-3.rs

+1-1
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-
extern crate "issue-13872-2" as bar;
11+
extern crate issue_13872_2 as bar;
1212

1313
use bar::B;
1414

‎src/test/auxiliary/static-function-pointer-aux.rs

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

11-
#![crate_name="static-function-pointer-aux"]
12-
1311
pub fn f(x: int) -> int { -x }
1412

1513
pub static F: fn(int) -> int = f;

‎src/test/auxiliary/trait_default_method_xc_aux.rs

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

11-
#![crate_name="trait_default_method_xc_aux"]
12-
1311
pub struct Something { pub x: int }
1412

1513
pub trait A {

‎src/test/compile-fail/use-meta-mismatch.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111
// error-pattern:can't find crate for `extra`
1212

13-
extern crate "fake-crate" as extra;
13+
extern crate fake_crate as extra;
1414

1515
fn main() { }

‎src/test/compile-fail/weak-lang-item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
#![no_std]
1818

1919
extern crate core;
20-
extern crate "weak-lang-items" as other;
20+
extern crate weak_lang_items;

‎src/test/debuginfo/basic-types-globals-metadata.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,33 @@
1212

1313
// compile-flags:-g
1414
// gdb-command:run
15-
// gdb-command:whatis 'basic-types-globals-metadata::B'
15+
// gdb-command:whatis 'basic_types_globals_metadata::B'
1616
// gdb-check:type = bool
17-
// gdb-command:whatis 'basic-types-globals-metadata::I'
17+
// gdb-command:whatis 'basic_types_globals_metadata::I'
1818
// gdb-check:type = isize
19-
// gdb-command:whatis 'basic-types-globals-metadata::C'
19+
// gdb-command:whatis 'basic_types_globals_metadata::C'
2020
// gdb-check:type = char
21-
// gdb-command:whatis 'basic-types-globals-metadata::I8'
21+
// gdb-command:whatis 'basic_types_globals_metadata::I8'
2222
// gdb-check:type = i8
23-
// gdb-command:whatis 'basic-types-globals-metadata::I16'
23+
// gdb-command:whatis 'basic_types_globals_metadata::I16'
2424
// gdb-check:type = i16
25-
// gdb-command:whatis 'basic-types-globals-metadata::I32'
25+
// gdb-command:whatis 'basic_types_globals_metadata::I32'
2626
// gdb-check:type = i32
27-
// gdb-command:whatis 'basic-types-globals-metadata::I64'
27+
// gdb-command:whatis 'basic_types_globals_metadata::I64'
2828
// gdb-check:type = i64
29-
// gdb-command:whatis 'basic-types-globals-metadata::U'
29+
// gdb-command:whatis 'basic_types_globals_metadata::U'
3030
// gdb-check:type = usize
31-
// gdb-command:whatis 'basic-types-globals-metadata::U8'
31+
// gdb-command:whatis 'basic_types_globals_metadata::U8'
3232
// gdb-check:type = u8
33-
// gdb-command:whatis 'basic-types-globals-metadata::U16'
33+
// gdb-command:whatis 'basic_types_globals_metadata::U16'
3434
// gdb-check:type = u16
35-
// gdb-command:whatis 'basic-types-globals-metadata::U32'
35+
// gdb-command:whatis 'basic_types_globals_metadata::U32'
3636
// gdb-check:type = u32
37-
// gdb-command:whatis 'basic-types-globals-metadata::U64'
37+
// gdb-command:whatis 'basic_types_globals_metadata::U64'
3838
// gdb-check:type = u64
39-
// gdb-command:whatis 'basic-types-globals-metadata::F32'
39+
// gdb-command:whatis 'basic_types_globals_metadata::F32'
4040
// gdb-check:type = f32
41-
// gdb-command:whatis 'basic-types-globals-metadata::F64'
41+
// gdb-command:whatis 'basic_types_globals_metadata::F64'
4242
// gdb-check:type = f64
4343
// gdb-command:continue
4444

‎src/test/debuginfo/basic-types-globals.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,33 @@
1818

1919
// compile-flags:-g
2020
// gdb-command:run
21-
// gdb-command:print 'basic-types-globals::B'
21+
// gdb-command:print 'basic_types_globals::B'
2222
// gdb-check:$1 = false
23-
// gdb-command:print 'basic-types-globals::I'
23+
// gdb-command:print 'basic_types_globals::I'
2424
// gdb-check:$2 = -1
25-
// gdb-command:print 'basic-types-globals::C'
25+
// gdb-command:print 'basic_types_globals::C'
2626
// gdb-check:$3 = 97
27-
// gdb-command:print/d 'basic-types-globals::I8'
27+
// gdb-command:print/d 'basic_types_globals::I8'
2828
// gdb-check:$4 = 68
29-
// gdb-command:print 'basic-types-globals::I16'
29+
// gdb-command:print 'basic_types_globals::I16'
3030
// gdb-check:$5 = -16
31-
// gdb-command:print 'basic-types-globals::I32'
31+
// gdb-command:print 'basic_types_globals::I32'
3232
// gdb-check:$6 = -32
33-
// gdb-command:print 'basic-types-globals::I64'
33+
// gdb-command:print 'basic_types_globals::I64'
3434
// gdb-check:$7 = -64
35-
// gdb-command:print 'basic-types-globals::U'
35+
// gdb-command:print 'basic_types_globals::U'
3636
// gdb-check:$8 = 1
37-
// gdb-command:print/d 'basic-types-globals::U8'
37+
// gdb-command:print/d 'basic_types_globals::U8'
3838
// gdb-check:$9 = 100
39-
// gdb-command:print 'basic-types-globals::U16'
39+
// gdb-command:print 'basic_types_globals::U16'
4040
// gdb-check:$10 = 16
41-
// gdb-command:print 'basic-types-globals::U32'
41+
// gdb-command:print 'basic_types_globals::U32'
4242
// gdb-check:$11 = 32
43-
// gdb-command:print 'basic-types-globals::U64'
43+
// gdb-command:print 'basic_types_globals::U64'
4444
// gdb-check:$12 = 64
45-
// gdb-command:print 'basic-types-globals::F32'
45+
// gdb-command:print 'basic_types_globals::F32'
4646
// gdb-check:$13 = 2.5
47-
// gdb-command:print 'basic-types-globals::F64'
47+
// gdb-command:print 'basic_types_globals::F64'
4848
// gdb-check:$14 = 3.5
4949
// gdb-command:continue
5050

‎src/test/debuginfo/basic-types-mut-globals.rs

+28-28
Original file line numberDiff line numberDiff line change
@@ -21,64 +21,64 @@
2121
// gdb-command:run
2222

2323
// Check initializers
24-
// gdb-command:print 'basic-types-mut-globals::B'
24+
// gdb-command:print 'basic_types_mut_globals::B'
2525
// gdb-check:$1 = false
26-
// gdb-command:print 'basic-types-mut-globals::I'
26+
// gdb-command:print 'basic_types_mut_globals::I'
2727
// gdb-check:$2 = -1
28-
// gdb-command:print 'basic-types-mut-globals::C'
28+
// gdb-command:print 'basic_types_mut_globals::C'
2929
// gdb-check:$3 = 97
30-
// gdb-command:print/d 'basic-types-mut-globals::I8'
30+
// gdb-command:print/d 'basic_types_mut_globals::I8'
3131
// gdb-check:$4 = 68
32-
// gdb-command:print 'basic-types-mut-globals::I16'
32+
// gdb-command:print 'basic_types_mut_globals::I16'
3333
// gdb-check:$5 = -16
34-
// gdb-command:print 'basic-types-mut-globals::I32'
34+
// gdb-command:print 'basic_types_mut_globals::I32'
3535
// gdb-check:$6 = -32
36-
// gdb-command:print 'basic-types-mut-globals::I64'
36+
// gdb-command:print 'basic_types_mut_globals::I64'
3737
// gdb-check:$7 = -64
38-
// gdb-command:print 'basic-types-mut-globals::U'
38+
// gdb-command:print 'basic_types_mut_globals::U'
3939
// gdb-check:$8 = 1
40-
// gdb-command:print/d 'basic-types-mut-globals::U8'
40+
// gdb-command:print/d 'basic_types_mut_globals::U8'
4141
// gdb-check:$9 = 100
42-
// gdb-command:print 'basic-types-mut-globals::U16'
42+
// gdb-command:print 'basic_types_mut_globals::U16'
4343
// gdb-check:$10 = 16
44-
// gdb-command:print 'basic-types-mut-globals::U32'
44+
// gdb-command:print 'basic_types_mut_globals::U32'
4545
// gdb-check:$11 = 32
46-
// gdb-command:print 'basic-types-mut-globals::U64'
46+
// gdb-command:print 'basic_types_mut_globals::U64'
4747
// gdb-check:$12 = 64
48-
// gdb-command:print 'basic-types-mut-globals::F32'
48+
// gdb-command:print 'basic_types_mut_globals::F32'
4949
// gdb-check:$13 = 2.5
50-
// gdb-command:print 'basic-types-mut-globals::F64'
50+
// gdb-command:print 'basic_types_mut_globals::F64'
5151
// gdb-check:$14 = 3.5
5252
// gdb-command:continue
5353

5454
// Check new values
55-
// gdb-command:print 'basic-types-mut-globals'::B
55+
// gdb-command:print 'basic_types_mut_globals'::B
5656
// gdb-check:$15 = true
57-
// gdb-command:print 'basic-types-mut-globals'::I
57+
// gdb-command:print 'basic_types_mut_globals'::I
5858
// gdb-check:$16 = 2
59-
// gdb-command:print 'basic-types-mut-globals'::C
59+
// gdb-command:print 'basic_types_mut_globals'::C
6060
// gdb-check:$17 = 102
61-
// gdb-command:print/d 'basic-types-mut-globals'::I8
61+
// gdb-command:print/d 'basic_types_mut_globals'::I8
6262
// gdb-check:$18 = 78
63-
// gdb-command:print 'basic-types-mut-globals'::I16
63+
// gdb-command:print 'basic_types_mut_globals'::I16
6464
// gdb-check:$19 = -26
65-
// gdb-command:print 'basic-types-mut-globals'::I32
65+
// gdb-command:print 'basic_types_mut_globals'::I32
6666
// gdb-check:$20 = -12
67-
// gdb-command:print 'basic-types-mut-globals'::I64
67+
// gdb-command:print 'basic_types_mut_globals'::I64
6868
// gdb-check:$21 = -54
69-
// gdb-command:print 'basic-types-mut-globals'::U
69+
// gdb-command:print 'basic_types_mut_globals'::U
7070
// gdb-check:$22 = 5
71-
// gdb-command:print/d 'basic-types-mut-globals'::U8
71+
// gdb-command:print/d 'basic_types_mut_globals'::U8
7272
// gdb-check:$23 = 20
73-
// gdb-command:print 'basic-types-mut-globals'::U16
73+
// gdb-command:print 'basic_types_mut_globals'::U16
7474
// gdb-check:$24 = 32
75-
// gdb-command:print 'basic-types-mut-globals'::U32
75+
// gdb-command:print 'basic_types_mut_globals'::U32
7676
// gdb-check:$25 = 16
77-
// gdb-command:print 'basic-types-mut-globals'::U64
77+
// gdb-command:print 'basic_types_mut_globals'::U64
7878
// gdb-check:$26 = 128
79-
// gdb-command:print 'basic-types-mut-globals'::F32
79+
// gdb-command:print 'basic_types_mut_globals'::F32
8080
// gdb-check:$27 = 5.75
81-
// gdb-command:print 'basic-types-mut-globals'::F64
81+
// gdb-command:print 'basic_types_mut_globals'::F64
8282
// gdb-check:$28 = 9.25
8383

8484
#![allow(unused_variables)]

‎src/test/debuginfo/c-style-enum.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@
1515

1616
// === GDB TESTS ===================================================================================
1717

18-
// gdb-command:print 'c-style-enum::SINGLE_VARIANT'
18+
// gdb-command:print 'c_style_enum::SINGLE_VARIANT'
1919
// gdb-check:$1 = TheOnlyVariant
2020

21-
// gdb-command:print 'c-style-enum::AUTO_ONE'
21+
// gdb-command:print 'c_style_enum::AUTO_ONE'
2222
// gdb-check:$2 = One
2323

24-
// gdb-command:print 'c-style-enum::AUTO_TWO'
24+
// gdb-command:print 'c_style_enum::AUTO_TWO'
2525
// gdb-check:$3 = One
2626

27-
// gdb-command:print 'c-style-enum::AUTO_THREE'
27+
// gdb-command:print 'c_style_enum::AUTO_THREE'
2828
// gdb-check:$4 = One
2929

30-
// gdb-command:print 'c-style-enum::MANUAL_ONE'
30+
// gdb-command:print 'c_style_enum::MANUAL_ONE'
3131
// gdb-check:$5 = OneHundred
3232

33-
// gdb-command:print 'c-style-enum::MANUAL_TWO'
33+
// gdb-command:print 'c_style_enum::MANUAL_TWO'
3434
// gdb-check:$6 = OneHundred
3535

36-
// gdb-command:print 'c-style-enum::MANUAL_THREE'
36+
// gdb-command:print 'c_style_enum::MANUAL_THREE'
3737
// gdb-check:$7 = OneHundred
3838

3939
// gdb-command:run
@@ -59,16 +59,16 @@
5959
// gdb-command:print single_variant
6060
// gdb-check:$14 = TheOnlyVariant
6161

62-
// gdb-command:print 'c-style-enum::AUTO_TWO'
62+
// gdb-command:print 'c_style_enum::AUTO_TWO'
6363
// gdb-check:$15 = Two
6464

65-
// gdb-command:print 'c-style-enum::AUTO_THREE'
65+
// gdb-command:print 'c_style_enum::AUTO_THREE'
6666
// gdb-check:$16 = Three
6767

68-
// gdb-command:print 'c-style-enum::MANUAL_TWO'
68+
// gdb-command:print 'c_style_enum::MANUAL_TWO'
6969
// gdb-check:$17 = OneThousand
7070

71-
// gdb-command:print 'c-style-enum::MANUAL_THREE'
71+
// gdb-command:print 'c_style_enum::MANUAL_THREE'
7272
// gdb-check:$18 = OneMillion
7373

7474

‎src/test/debuginfo/generic-struct.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
// lldb-check:[...]$2 = AGenericStruct<f64, i32> { key: 4.5, value: 5 }
3939

4040
// lldb-command:print float_int_float
41-
// lldb-check:[...]$3 = AGenericStruct<f64, generic-struct::AGenericStruct<i32, f64>> { key: 6.5, value: AGenericStruct<i32, f64> { key: 7, value: 8.5 } }
41+
// lldb-check:[...]$3 = AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64>> { key: 6.5, value: AGenericStruct<i32, f64> { key: 7, value: 8.5 } }
4242

4343

4444
#![omit_gdb_pretty_printer_section]

0 commit comments

Comments
 (0)