Skip to content

Commit

Permalink
Update tests for erasing regions in typeck
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthewjasper
matthewjasper committed Mar 17, 2020
1 parent 0a7f16e commit 1ee5829
Show file tree
Hide file tree
Showing 20 changed files with 110 additions and 89 deletions.
4 changes: 2 additions & 2 deletions src/test/incremental/hashes/closure_expressions.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ pub fn add_type_ascription_to_parameter() {
}

#[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_items, mir_built, typeck_tables_of")]
#[rustc_clean(cfg="cfail3")]
#[rustc_clean(cfg = "cfail2", except = "hir_owner_items, typeck_tables_of")]
#[rustc_clean(cfg = "cfail3")]
pub fn add_type_ascription_to_parameter() {
let closure = |x: u32| x + 1u32;
let _: u32 = closure(1);
Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/inherent_impls.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ impl Foo {
impl Foo {
#[rustc_clean(
cfg="cfail2",
except="hir_owner,hir_owner_items,generics_of,predicates_of,type_of,typeck_tables_of"
except="hir_owner,hir_owner_items,generics_of,predicates_of,type_of"
)]
#[rustc_clean(cfg="cfail3")]
pub fn add_lifetime_bound_to_lifetime_param_of_method<'a, 'b: 'a>(&self) { }
Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/hashes/unary_and_binary_exprs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ pub fn var_deref(x: &i32, y: &i32) -> i32 {
}

#[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_items,optimized_mir,mir_built,typeck_tables_of", cfg="cfail2")]
#[rustc_clean(except="hir_owner_items,optimized_mir,mir_built", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")]
pub fn var_deref(x: &i32, y: &i32) -> i32 {
*y
Expand Down
20 changes: 10 additions & 10 deletions src/test/mir-opt/const-promotion-extern-static.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ extern "C" {

static Y: i32 = 42;

static mut BAR: *const &'static i32 = [&Y].as_ptr();
static mut BAR: *const &i32 = [&Y].as_ptr();

static mut FOO: *const &'static i32 = [unsafe { &X }].as_ptr();
static mut FOO: *const &i32 = [unsafe { &X }].as_ptr();

fn main() {}

Expand All @@ -18,8 +18,8 @@ fn main() {}
// _4 = &(*_5);
// _3 = [move _4];
// _2 = &_3;
// _1 = move _2 as &[&'static i32] (Pointer(Unsize));
// _0 = const core::slice::<impl [&'static i32]>::as_ptr(move _1) -> [return: bb2, unwind: bb1];
// _1 = move _2 as &[&i32] (Pointer(Unsize));
// _0 = const core::slice::<impl [&i32]>::as_ptr(move _1) -> [return: bb2, unwind: bb1];
// }
// ...
// bb2: {
Expand All @@ -35,8 +35,8 @@ fn main() {}
// _4 = &(*_5);
// _3 = [move _4];
// _2 = &_3;
// _1 = move _2 as &[&'static i32] (Pointer(Unsize));
// _0 = const core::slice::<impl [&'static i32]>::as_ptr(move _1) -> [return: bb2, unwind: bb1];
// _1 = move _2 as &[&i32] (Pointer(Unsize));
// _0 = const core::slice::<impl [&i32]>::as_ptr(move _1) -> [return: bb2, unwind: bb1];
// }
// ...
// bb2: {
Expand All @@ -50,8 +50,8 @@ fn main() {}
// ...
// _6 = const BAR::promoted[0];
// _2 = &(*_6);
// _1 = move _2 as &[&'static i32] (Pointer(Unsize));
// _0 = const core::slice::<impl [&'static i32]>::as_ptr(move _1) -> [return: bb2, unwind: bb1];
// _1 = move _2 as &[&i32] (Pointer(Unsize));
// _0 = const core::slice::<impl [&i32]>::as_ptr(move _1) -> [return: bb2, unwind: bb1];
// }
// ...
// bb2: {
Expand All @@ -63,8 +63,8 @@ fn main() {}
// ...
// _6 = const FOO::promoted[0];
// _2 = &(*_6);
// _1 = move _2 as &[&'static i32] (Pointer(Unsize));
// _0 = const core::slice::<impl [&'static i32]>::as_ptr(move _1) -> [return: bb2, unwind: bb1];
// _1 = move _2 as &[&i32] (Pointer(Unsize));
// _0 = const core::slice::<impl [&i32]>::as_ptr(move _1) -> [return: bb2, unwind: bb1];
// }
// ...
// bb2: {
Expand Down
2 changes: 1 addition & 1 deletion src/test/mir-opt/no-drop-for-inactive-variant.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fn main() {
// }
// bb2: {
// ...
// const std::rt::begin_panic::<&'static str>(const "explicit panic") -> bb5;
// const std::rt::begin_panic::<&str>(const "explicit panic") -> bb5;
// }
// bb3: {
// unreachable;
Expand Down
10 changes: 5 additions & 5 deletions src/test/mir-opt/remove_fake_borrows.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ fn main() {
// goto -> bb7;
// }
// bb2: {
// switchInt((*(*((_1 as Some).0: &'<empty> &'<empty> i32)))) -> [0i32: bb3, otherwise: bb1];
// switchInt((*(*((_1 as Some).0: &&i32)))) -> [0i32: bb3, otherwise: bb1];
// }
// bb3: {
// goto -> bb4;
// }
// bb4: {
// _4 = &shallow _1;
// _5 = &shallow ((_1 as Some).0: &'<empty> &'<empty> i32);
// _6 = &shallow (*((_1 as Some).0: &'<empty> &'<empty> i32));
// _7 = &shallow (*(*((_1 as Some).0: &'<empty> &'<empty> i32)));
// _5 = &shallow ((_1 as Some).0: &&i32);
// _6 = &shallow (*((_1 as Some).0: &&i32));
// _7 = &shallow (*(*((_1 as Some).0: &&i32)));
// StorageLive(_8);
// _8 = _2;
// switchInt(move _8) -> [false: bb6, otherwise: bb5];
Expand Down Expand Up @@ -72,7 +72,7 @@ fn main() {
// goto -> bb7;
// }
// bb2: {
// switchInt((*(*((_1 as Some).0: &'<empty> &'<empty> i32)))) -> [0i32: bb3, otherwise: bb1];
// switchInt((*(*((_1 as Some).0: &&i32)))) -> [0i32: bb3, otherwise: bb1];
// }
// bb3: {
// goto -> bb4;
Expand Down
12 changes: 6 additions & 6 deletions src/test/mir-opt/storage_live_dead_in_statics.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ fn main() {

// END RUST SOURCE
// START rustc.XXX.mir_map.0.mir
// let mut _0: &'static Foo;
// let _1: &'static Foo;
// let mut _0: &Foo;
// let _1: &Foo;
// let _2: Foo;
// let mut _3: &'static [(u32, u32)];
// let mut _4: &'static [(u32, u32); 42];
// let _5: &'static [(u32, u32); 42];
// let mut _3: &[(u32, u32)];
// let mut _4: &[(u32, u32); 42];
// let _5: &[(u32, u32); 42];
// let _6: [(u32, u32); 42];
// let mut _7: (u32, u32);
// let mut _8: (u32, u32);
Expand Down Expand Up @@ -178,7 +178,7 @@ fn main() {
// _6 = [move _7, move _8, move _9, move _10, move _11, move _12, move _13, move _14, move _15, move _16, move _17, move _18, move _19, move _20, move _21, move _22, move _23, move _24, move _25, move _26, move _27, move _28, move _29, move _30, move _31, move _32, move _33, move _34, move _35, move _36, move _37, move _38, move _39, move _40, move _41, move _42, move _43, move _44, move _45, move _46, move _47, move _48];
// _5 = &_6;
// _4 = &(*_5);
// _3 = move _4 as &'static [(u32, u32)] (Pointer(Unsize));
// _3 = move _4 as &[(u32, u32)] (Pointer(Unsize));
// _2 = Foo { tup: const "hi", data: move _3 };
// _1 = &_2;
// _0 = &(*_1);
Expand Down
44 changes: 22 additions & 22 deletions src/test/pretty/issue-4264.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,29 @@
((::alloc::fmt::format as
for<'r> fn(std::fmt::Arguments<'r>) -> std::string::String {std::fmt::format})(((::core::fmt::Arguments::new_v1
as
fn(&[&str], &[std::fmt::ArgumentV1<'_>]) -> std::fmt::Arguments<'_> {std::fmt::Arguments::<'_>::new_v1})((&([("test"
as
&'static str)]
as
[&str; 1])
as
&[&str; 1]),
(&(match (()
as
())
{
()
=>
([]
as
[std::fmt::ArgumentV1<'_>; 0]),
}
as
[std::fmt::ArgumentV1<'_>; 0])
as
&[std::fmt::ArgumentV1<'_>; 0]))
fn(&[&str], &[std::fmt::ArgumentV1]) -> std::fmt::Arguments {std::fmt::Arguments::new_v1})((&([("test"
as
&str)]
as
[&str; 1])
as
&[&str; 1]),
(&(match (()
as
())
{
()
=>
([]
as
[std::fmt::ArgumentV1; 0]),
}
as
[std::fmt::ArgumentV1; 0])
as
&[std::fmt::ArgumentV1; 0]))
as
std::fmt::Arguments<'_>))
std::fmt::Arguments))
as std::string::String);
(res as std::string::String)
} as std::string::String);
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/consts/transmute-size-mismatch-before-typeck.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ LL | const ZST: &[u8] = unsafe { std::mem::transmute(1usize) };
| ^^^^^^^^^^^^^^^^^^^
|
= note: source type: `usize` (word size)
= note: target type: `&'static [u8]` (2 * word size)
= note: target type: `&[u8]` (2 * word size)

error: could not evaluate constant pattern
--> $DIR/transmute-size-mismatch-before-typeck.rs:10:9
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/error-codes/E0121.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LL | static BAR: _ = "test";
| ^
| |
| not allowed in type signatures
| help: replace `_` with the correct type: `&'static str`
| help: replace `_` with the correct type: `&str`

error: aborting due to 2 previous errors

Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/issues/issue-21174.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ error[E0512]: cannot transmute between types of different sizes, or dependently-
LL | let new: T::B = unsafe { std::mem::transmute(value) };
| ^^^^^^^^^^^^^^^^^^^
|
= note: source type: `<T as Trait<'a>>::A` (size can vary because of <T as Trait>::A)
= note: target type: `<T as Trait<'a>>::B` (size can vary because of <T as Trait>::B)
= note: source type: `<T as Trait>::A` (this type does not have a fixed size)
= note: target type: `<T as Trait>::B` (this type does not have a fixed size)

error: aborting due to previous error

Expand Down
Loading

0 comments on commit 1ee5829

Please sign in to comment.