Skip to content

Commit ba6d406

Browse files
nikomatsakisnikomatsakis
committed
fallout: update codegen-units tests
1 parent 3988fd0 commit ba6d406

16 files changed

+74
-74
lines changed

‎src/test/codegen-units/cross-crate-closures.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ extern crate cgu_extern_closures;
1919
//~ TRANS_ITEM fn cross_crate_closures::main[0]
2020
fn main() {
2121

22-
//~ TRANS_ITEM fn cgu_extern_closures[0]::inlined_fn[0]
23-
//~ TRANS_ITEM fn cgu_extern_closures[0]::inlined_fn[0]::{{closure}}[0]
22+
//~ TRANS_ITEM fn cgu_extern_closures::inlined_fn[0]
23+
//~ TRANS_ITEM fn cgu_extern_closures::inlined_fn[0]::{{closure}}[0]
2424
let _ = cgu_extern_closures::inlined_fn(1, 2);
2525

26-
//~ TRANS_ITEM fn cgu_extern_closures[0]::inlined_fn_generic[0]<i32>
27-
//~ TRANS_ITEM fn cgu_extern_closures[0]::inlined_fn_generic[0]::{{closure}}[0]<i32>
26+
//~ TRANS_ITEM fn cgu_extern_closures::inlined_fn_generic[0]<i32>
27+
//~ TRANS_ITEM fn cgu_extern_closures::inlined_fn_generic[0]::{{closure}}[0]<i32>
2828
let _ = cgu_extern_closures::inlined_fn_generic(3, 4, 5i32);
2929

3030
// Nothing should be generated for this call, we just link to the instance instance

‎src/test/codegen-units/cross-crate-generic-functions.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ extern crate cgu_generic_function;
1919
//~ TRANS_ITEM fn cross_crate_generic_functions::main[0]
2020
fn main()
2121
{
22-
//~ TRANS_ITEM fn cgu_generic_function[0]::bar[0]<u32>
23-
//~ TRANS_ITEM fn cgu_generic_function[0]::foo[0]<u32>
22+
//~ TRANS_ITEM fn cgu_generic_function::bar[0]<u32>
23+
//~ TRANS_ITEM fn cgu_generic_function::foo[0]<u32>
2424
let _ = cgu_generic_function::foo(1u32);
2525

26-
//~ TRANS_ITEM fn cgu_generic_function[0]::bar[0]<u64>
27-
//~ TRANS_ITEM fn cgu_generic_function[0]::foo[0]<u64>
26+
//~ TRANS_ITEM fn cgu_generic_function::bar[0]<u64>
27+
//~ TRANS_ITEM fn cgu_generic_function::foo[0]<u64>
2828
let _ = cgu_generic_function::foo(2u64);
2929

3030
// This should not introduce a codegen item

‎src/test/codegen-units/cross-crate-trait-method.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,31 @@ fn main()
2929
// Currently, no object code is generated for trait methods with default
3030
// implemenations, unless they are actually called from somewhere. Therefore
3131
// we cannot import the implementations and have to create our own inline.
32-
//~ TRANS_ITEM fn cgu_export_trait_method[0]::Trait[0]::with_default_impl[0]<u32>
32+
//~ TRANS_ITEM fn cgu_export_trait_method::Trait[0]::with_default_impl[0]<u32>
3333
let _ = Trait::with_default_impl(0u32);
34-
//~ TRANS_ITEM fn cgu_export_trait_method[0]::Trait[0]::with_default_impl[0]<char>
34+
//~ TRANS_ITEM fn cgu_export_trait_method::Trait[0]::with_default_impl[0]<char>
3535
let _ = Trait::with_default_impl('c');
3636

3737

3838

39-
//~ TRANS_ITEM fn cgu_export_trait_method[0]::Trait[0]::with_default_impl_generic[0]<u32, &str>
39+
//~ TRANS_ITEM fn cgu_export_trait_method::Trait[0]::with_default_impl_generic[0]<u32, &str>
4040
let _ = Trait::with_default_impl_generic(0u32, "abc");
41-
//~ TRANS_ITEM fn cgu_export_trait_method[0]::Trait[0]::with_default_impl_generic[0]<u32, bool>
41+
//~ TRANS_ITEM fn cgu_export_trait_method::Trait[0]::with_default_impl_generic[0]<u32, bool>
4242
let _ = Trait::with_default_impl_generic(0u32, false);
4343

44-
//~ TRANS_ITEM fn cgu_export_trait_method[0]::Trait[0]::with_default_impl_generic[0]<char, i16>
44+
//~ TRANS_ITEM fn cgu_export_trait_method::Trait[0]::with_default_impl_generic[0]<char, i16>
4545
let _ = Trait::with_default_impl_generic('x', 1i16);
46-
//~ TRANS_ITEM fn cgu_export_trait_method[0]::Trait[0]::with_default_impl_generic[0]<char, i32>
46+
//~ TRANS_ITEM fn cgu_export_trait_method::Trait[0]::with_default_impl_generic[0]<char, i32>
4747
let _ = Trait::with_default_impl_generic('y', 0i32);
4848

49-
//~ TRANS_ITEM fn cgu_export_trait_method[0]::u32.Trait[0]::without_default_impl_generic[0]<char>
49+
//~ TRANS_ITEM fn cgu_export_trait_method::{{impl}}[1]::without_default_impl_generic[0]<char>
5050
let _: (u32, char) = Trait::without_default_impl_generic('c');
51-
//~ TRANS_ITEM fn cgu_export_trait_method[0]::u32.Trait[0]::without_default_impl_generic[0]<bool>
51+
//~ TRANS_ITEM fn cgu_export_trait_method::{{impl}}[1]::without_default_impl_generic[0]<bool>
5252
let _: (u32, bool) = Trait::without_default_impl_generic(false);
5353

54-
//~ TRANS_ITEM fn cgu_export_trait_method[0]::char.Trait[0]::without_default_impl_generic[0]<char>
54+
//~ TRANS_ITEM fn cgu_export_trait_method::{{impl}}[0]::without_default_impl_generic[0]<char>
5555
let _: (char, char) = Trait::without_default_impl_generic('c');
56-
//~ TRANS_ITEM fn cgu_export_trait_method[0]::char.Trait[0]::without_default_impl_generic[0]<bool>
56+
//~ TRANS_ITEM fn cgu_export_trait_method::{{impl}}[0]::without_default_impl_generic[0]<bool>
5757
let _: (char, bool) = Trait::without_default_impl_generic(false);
5858
}
5959

‎src/test/codegen-units/generic-drop-glue.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ struct NonGenericWithDrop(i32);
4949

5050
impl Drop for NonGenericWithDrop {
5151
fn drop(&mut self) {}
52-
//~ TRANS_ITEM fn generic_drop_glue::NonGenericWithDrop.Drop[0]::drop[0]
52+
//~ TRANS_ITEM fn generic_drop_glue::{{impl}}[2]::drop[0]
5353
}
5454

5555
//~ TRANS_ITEM fn generic_drop_glue::main[0]
5656
fn main() {
5757
//~ TRANS_ITEM drop-glue generic_drop_glue::StructWithDrop[0]<i8, char>
58-
//~ TRANS_ITEM fn generic_drop_glue::StructWithDrop<T1, T2>.Drop[0]::drop[0]<i8, char>
58+
//~ TRANS_ITEM fn generic_drop_glue::{{impl}}[0]::drop[0]<i8, char>
5959
let _ = StructWithDrop { x: 0i8, y: 'a' }.x;
6060

6161
//~ TRANS_ITEM drop-glue generic_drop_glue::StructWithDrop[0]<&str, generic_drop_glue::NonGenericNoDrop[0]>
62-
//~ TRANS_ITEM fn generic_drop_glue::StructWithDrop<T1, T2>.Drop[0]::drop[0]<&str, generic_drop_glue::NonGenericNoDrop[0]>
62+
//~ TRANS_ITEM fn generic_drop_glue::{{impl}}[0]::drop[0]<&str, generic_drop_glue::NonGenericNoDrop[0]>
6363
let _ = StructWithDrop { x: "&str", y: NonGenericNoDrop(0) }.y;
6464

6565
// Should produce no drop glue
@@ -71,14 +71,14 @@ fn main() {
7171
let _ = StructNoDrop { x: NonGenericWithDrop(0), y: 0f64 }.y;
7272

7373
//~ TRANS_ITEM drop-glue generic_drop_glue::EnumWithDrop[0]<i32, i64>
74-
//~ TRANS_ITEM fn generic_drop_glue::EnumWithDrop<T1, T2>.Drop[0]::drop[0]<i32, i64>
74+
//~ TRANS_ITEM fn generic_drop_glue::{{impl}}[1]::drop[0]<i32, i64>
7575
let _ = match EnumWithDrop::A::<i32, i64>(0) {
7676
EnumWithDrop::A(x) => x,
7777
EnumWithDrop::B(x) => x as i32
7878
};
7979

8080
//~ TRANS_ITEM drop-glue generic_drop_glue::EnumWithDrop[0]<f64, f32>
81-
//~ TRANS_ITEM fn generic_drop_glue::EnumWithDrop<T1, T2>.Drop[0]::drop[0]<f64, f32>
81+
//~ TRANS_ITEM fn generic_drop_glue::{{impl}}[1]::drop[0]<f64, f32>
8282
let _ = match EnumWithDrop::B::<f64, f32>(1.0) {
8383
EnumWithDrop::A(x) => x,
8484
EnumWithDrop::B(x) => x as f64

‎src/test/codegen-units/generic-impl.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ pub struct LifeTimeOnly<'a> {
4040

4141
impl<'a> LifeTimeOnly<'a> {
4242

43-
//~ TRANS_ITEM fn generic_impl::LifeTimeOnly<'a>[0]::foo[0]
43+
//~ TRANS_ITEM fn generic_impl::{{impl}}[1]::foo[0]
4444
pub fn foo(&self) {}
45-
//~ TRANS_ITEM fn generic_impl::LifeTimeOnly<'a>[0]::bar[0]
45+
//~ TRANS_ITEM fn generic_impl::{{impl}}[1]::bar[0]
4646
pub fn bar(&'a self) {}
47-
//~ TRANS_ITEM fn generic_impl::LifeTimeOnly<'a>[0]::baz[0]
47+
//~ TRANS_ITEM fn generic_impl::{{impl}}[1]::baz[0]
4848
pub fn baz<'b>(&'b self) {}
4949

5050
pub fn non_instantiated<T>(&self) {}
@@ -53,27 +53,27 @@ impl<'a> LifeTimeOnly<'a> {
5353

5454
//~ TRANS_ITEM fn generic_impl::main[0]
5555
fn main() {
56-
//~ TRANS_ITEM fn generic_impl::Struct<T>[0]::new[0]<i32>
56+
//~ TRANS_ITEM fn generic_impl::{{impl}}[0]::new[0]<i32>
5757
//~ TRANS_ITEM fn generic_impl::id[0]<i32>
58-
//~ TRANS_ITEM fn generic_impl::Struct<T>[0]::get[0]<i32, i16>
58+
//~ TRANS_ITEM fn generic_impl::{{impl}}[0]::get[0]<i32, i16>
5959
let _ = Struct::new(0i32).get(0i16);
6060

61-
//~ TRANS_ITEM fn generic_impl::Struct<T>[0]::new[0]<i64>
61+
//~ TRANS_ITEM fn generic_impl::{{impl}}[0]::new[0]<i64>
6262
//~ TRANS_ITEM fn generic_impl::id[0]<i64>
63-
//~ TRANS_ITEM fn generic_impl::Struct<T>[0]::get[0]<i64, i16>
63+
//~ TRANS_ITEM fn generic_impl::{{impl}}[0]::get[0]<i64, i16>
6464
let _ = Struct::new(0i64).get(0i16);
6565

66-
//~ TRANS_ITEM fn generic_impl::Struct<T>[0]::new[0]<char>
66+
//~ TRANS_ITEM fn generic_impl::{{impl}}[0]::new[0]<char>
6767
//~ TRANS_ITEM fn generic_impl::id[0]<char>
68-
//~ TRANS_ITEM fn generic_impl::Struct<T>[0]::get[0]<char, i16>
68+
//~ TRANS_ITEM fn generic_impl::{{impl}}[0]::get[0]<char, i16>
6969
let _ = Struct::new('c').get(0i16);
7070

71-
//~ TRANS_ITEM fn generic_impl::Struct<T>[0]::new[0]<&str>
71+
//~ TRANS_ITEM fn generic_impl::{{impl}}[0]::new[0]<&str>
7272
//~ TRANS_ITEM fn generic_impl::id[0]<&str>
73-
//~ TRANS_ITEM fn generic_impl::Struct<T>[0]::get[0]<generic_impl::Struct[0]<&str>, i16>
73+
//~ TRANS_ITEM fn generic_impl::{{impl}}[0]::get[0]<generic_impl::Struct[0]<&str>, i16>
7474
let _ = Struct::new(Struct::new("str")).get(0i16);
7575

76-
//~ TRANS_ITEM fn generic_impl::Struct<T>[0]::new[0]<generic_impl::Struct[0]<&str>>
76+
//~ TRANS_ITEM fn generic_impl::{{impl}}[0]::new[0]<generic_impl::Struct[0]<&str>>
7777
//~ TRANS_ITEM fn generic_impl::id[0]<generic_impl::Struct[0]<&str>>
7878
let _ = (Struct::new(Struct::new("str")).f)(Struct::new("str"));
7979
}

‎src/test/codegen-units/impl-in-non-instantiated-generic.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ trait SomeTrait {
2121
// discovered.
2222
pub fn generic_function<T>(x: T) -> (T, i32) {
2323
impl SomeTrait for i64 {
24-
//~ TRANS_ITEM fn impl_in_non_instantiated_generic::generic_function[0]::i64.SomeTrait[0]::foo[0]
24+
//~ TRANS_ITEM fn impl_in_non_instantiated_generic::generic_function[0]::{{impl}}[0]::foo[0]
2525
fn foo(&self) {}
2626
}
2727

‎src/test/codegen-units/instantiation-through-vtable.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ impl<T> Trait for Struct<T> {
3131
fn main() {
3232
let s1 = Struct { _a: 0u32 };
3333

34-
//~ TRANS_ITEM fn instantiation_through_vtable::Struct<T>.Trait[0]::foo[0]<u32>
35-
//~ TRANS_ITEM fn instantiation_through_vtable::Struct<T>.Trait[0]::bar[0]<u32>
34+
//~ TRANS_ITEM fn instantiation_through_vtable::{{impl}}[0]::foo[0]<u32>
35+
//~ TRANS_ITEM fn instantiation_through_vtable::{{impl}}[0]::bar[0]<u32>
3636
let _ = &s1 as &Trait;
3737

3838
let s1 = Struct { _a: 0u64 };
39-
//~ TRANS_ITEM fn instantiation_through_vtable::Struct<T>.Trait[0]::foo[0]<u64>
40-
//~ TRANS_ITEM fn instantiation_through_vtable::Struct<T>.Trait[0]::bar[0]<u64>
39+
//~ TRANS_ITEM fn instantiation_through_vtable::{{impl}}[0]::foo[0]<u64>
40+
//~ TRANS_ITEM fn instantiation_through_vtable::{{impl}}[0]::bar[0]<u64>
4141
let _ = &s1 as &Trait;
4242
}

‎src/test/codegen-units/non-generic-drop-glue.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct StructWithDrop {
1919
}
2020

2121
impl Drop for StructWithDrop {
22-
//~ TRANS_ITEM fn non_generic_drop_glue::StructWithDrop.Drop[0]::drop[0]
22+
//~ TRANS_ITEM fn non_generic_drop_glue::{{impl}}[0]::drop[0]
2323
fn drop(&mut self) {}
2424
}
2525

@@ -33,7 +33,7 @@ enum EnumWithDrop {
3333
}
3434

3535
impl Drop for EnumWithDrop {
36-
//~ TRANS_ITEM fn non_generic_drop_glue::EnumWithDrop.Drop[0]::drop[0]
36+
//~ TRANS_ITEM fn non_generic_drop_glue::{{impl}}[1]::drop[0]
3737
fn drop(&mut self) {}
3838
}
3939

‎src/test/codegen-units/non-generic-functions.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,31 @@ fn bar() {
3838
struct Struct { _x: i32 }
3939

4040
impl Struct {
41-
//~ TRANS_ITEM fn non_generic_functions::Struct[0]::foo[0]
41+
//~ TRANS_ITEM fn non_generic_functions::{{impl}}[0]::foo[0]
4242
fn foo() {
4343
{
44-
//~ TRANS_ITEM fn non_generic_functions::Struct[0]::foo[0]::foo[0]
44+
//~ TRANS_ITEM fn non_generic_functions::{{impl}}[0]::foo[0]::foo[0]
4545
fn foo() {}
4646
foo();
4747
}
4848

4949
{
50-
//~ TRANS_ITEM fn non_generic_functions::Struct[0]::foo[0]::foo[1]
50+
//~ TRANS_ITEM fn non_generic_functions::{{impl}}[0]::foo[0]::foo[1]
5151
fn foo() {}
5252
foo();
5353
}
5454
}
5555

56-
//~ TRANS_ITEM fn non_generic_functions::Struct[0]::bar[0]
56+
//~ TRANS_ITEM fn non_generic_functions::{{impl}}[0]::bar[0]
5757
fn bar(&self) {
5858
{
59-
//~ TRANS_ITEM fn non_generic_functions::Struct[0]::bar[0]::foo[0]
59+
//~ TRANS_ITEM fn non_generic_functions::{{impl}}[0]::bar[0]::foo[0]
6060
fn foo() {}
6161
foo();
6262
}
6363

6464
{
65-
//~ TRANS_ITEM fn non_generic_functions::Struct[0]::bar[0]::foo[1]
65+
//~ TRANS_ITEM fn non_generic_functions::{{impl}}[0]::bar[0]::foo[1]
6666
fn foo() {}
6767
foo();
6868
}

‎src/test/codegen-units/overloaded-operators.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub struct Indexable {
2323
impl Index<usize> for Indexable {
2424
type Output = u8;
2525

26-
//~ TRANS_ITEM fn overloaded_operators::Indexable.Index<usize>[0]::index[0]
26+
//~ TRANS_ITEM fn overloaded_operators::{{impl}}[0]::index[0]
2727
fn index(&self, index: usize) -> &Self::Output {
2828
if index >= 3 {
2929
&self.data[0]
@@ -34,7 +34,7 @@ impl Index<usize> for Indexable {
3434
}
3535

3636
impl IndexMut<usize> for Indexable {
37-
//~ TRANS_ITEM fn overloaded_operators::Indexable.IndexMut<usize>[0]::index_mut[0]
37+
//~ TRANS_ITEM fn overloaded_operators::{{impl}}[1]::index_mut[0]
3838
fn index_mut(&mut self, index: usize) -> &mut Self::Output {
3939
if index >= 3 {
4040
&mut self.data[0]
@@ -45,16 +45,16 @@ impl IndexMut<usize> for Indexable {
4545
}
4646

4747

48-
//~ TRANS_ITEM fn overloaded_operators::Equatable.::std::cmp::PartialEq[0]::eq[0]
49-
//~ TRANS_ITEM fn overloaded_operators::Equatable.::std::cmp::PartialEq[0]::ne[0]
48+
//~ TRANS_ITEM fn overloaded_operators::{{impl}}[2]::eq[0]
49+
//~ TRANS_ITEM fn overloaded_operators::{{impl}}[2]::ne[0]
5050
#[derive(PartialEq)]
5151
pub struct Equatable(u32);
5252

5353

5454
impl Add<u32> for Equatable {
5555
type Output = u32;
5656

57-
//~ TRANS_ITEM fn overloaded_operators::Equatable.Add<u32>[0]::add[0]
57+
//~ TRANS_ITEM fn overloaded_operators::{{impl}}[3]::add[0]
5858
fn add(self, rhs: u32) -> u32 {
5959
self.0 + rhs
6060
}
@@ -63,7 +63,7 @@ impl Add<u32> for Equatable {
6363
impl Deref for Equatable {
6464
type Target = u32;
6565

66-
//~ TRANS_ITEM fn overloaded_operators::Equatable.Deref[0]::deref[0]
66+
//~ TRANS_ITEM fn overloaded_operators::{{impl}}[4]::deref[0]
6767
fn deref(&self) -> &Self::Target {
6868
&self.0
6969
}

0 commit comments

Comments
 (0)