bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #45987 - gaurikholkar:let-expr, r=michaelwoerister

Browse source 
update let-expressions hash test to use `except`

A part of #44924, this PR updated let-expressions test using `except`.

cc @michaelwoerister
r? @nikomatsakis
This commit is contained in:
kennytm 2017-11-22 01:12:56 +08:00 • committed by GitHub
commit c0c3cc4d3d
1 changed files with 36 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

246
src/test/incremental/hashes/let_expressions.rs
View file

@ -32,26 +32,9 @@ pub fn change_name() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(label="Hir", cfg="cfail2")] #[rustc_clean(cfg="cfail2",
#[rustc_clean(label="Hir", cfg="cfail3")] except="HirBody,MirValidated,MirOptimized")]
#[rustc_dirty(label="HirBody", cfg="cfail2")] #[rustc_clean(cfg="cfail3")]
#[rustc_clean(label="HirBody", cfg="cfail3")]
#[rustc_metadata_clean(cfg="cfail2")]
#[rustc_metadata_clean(cfg="cfail3")]
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
#[rustc_clean(label="MirValidated", cfg="cfail3")]
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
#[rustc_clean(label="FnSignature", cfg="cfail2")]
#[rustc_clean(label="FnSignature", cfg="cfail3")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
pub fn change_name() { pub fn change_name() {
let _y = 2u64; let _y = 2u64;
} }
@ -65,26 +48,11 @@ pub fn add_type() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(label="Hir", cfg="cfail2")] #[rustc_clean(cfg="cfail2",
#[rustc_clean(label="Hir", cfg="cfail3")] except="HirBody,TypeckTables")]
#[rustc_dirty(label="HirBody", cfg="cfail2")] #[rustc_clean(cfg="cfail3")]
#[rustc_clean(label="HirBody", cfg="cfail3")]
#[rustc_metadata_clean(cfg="cfail2")] #[rustc_metadata_clean(cfg="cfail2")]
#[rustc_metadata_clean(cfg="cfail3")] #[rustc_metadata_clean(cfg="cfail3")]
#[rustc_clean(label="MirValidated", cfg="cfail2")]
#[rustc_clean(label="MirValidated", cfg="cfail3")]
#[rustc_clean(label="MirOptimized", cfg="cfail2")]
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
#[rustc_clean(label="FnSignature", cfg="cfail2")]
#[rustc_clean(label="FnSignature", cfg="cfail3")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
pub fn add_type() { pub fn add_type() {
let _x: u32 = 2u32; let _x: u32 = 2u32;
} }
@ -98,26 +66,11 @@ pub fn change_type() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(label="Hir", cfg="cfail2")] #[rustc_clean(cfg="cfail2",
#[rustc_clean(label="Hir", cfg="cfail3")] except="HirBody,TypeckTables,MirValidated,MirOptimized")]
#[rustc_dirty(label="HirBody", cfg="cfail2")] #[rustc_clean(cfg="cfail3")]
#[rustc_clean(label="HirBody", cfg="cfail3")]
#[rustc_metadata_clean(cfg="cfail2")] #[rustc_metadata_clean(cfg="cfail2")]
#[rustc_metadata_clean(cfg="cfail3")] #[rustc_metadata_clean(cfg="cfail3")]
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
#[rustc_clean(label="MirValidated", cfg="cfail3")]
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
#[rustc_clean(label="FnSignature", cfg="cfail2")]
#[rustc_clean(label="FnSignature", cfg="cfail3")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
pub fn change_type() { pub fn change_type() {
let _x: u8 = 2; let _x: u8 = 2;
} }
@ -131,26 +84,11 @@ pub fn change_mutability_of_reference_type() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(label="Hir", cfg="cfail2")] #[rustc_clean(cfg="cfail2",
#[rustc_clean(label="Hir", cfg="cfail3")] except="HirBody,TypeckTables,MirValidated")]
#[rustc_dirty(label="HirBody", cfg="cfail2")] #[rustc_clean(cfg="cfail3")]
#[rustc_clean(label="HirBody", cfg="cfail3")]
#[rustc_metadata_clean(cfg="cfail2")] #[rustc_metadata_clean(cfg="cfail2")]
#[rustc_metadata_clean(cfg="cfail3")] #[rustc_metadata_clean(cfg="cfail3")]
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
#[rustc_clean(label="MirValidated", cfg="cfail3")]
#[rustc_clean(label="MirOptimized", cfg="cfail2")]
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
#[rustc_clean(label="FnSignature", cfg="cfail2")]
#[rustc_clean(label="FnSignature", cfg="cfail3")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
pub fn change_mutability_of_reference_type() { pub fn change_mutability_of_reference_type() {
let _x: &mut u64; let _x: &mut u64;
} }
@ -164,26 +102,11 @@ pub fn change_mutability_of_slot() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(label="Hir", cfg="cfail2")] #[rustc_clean(cfg="cfail2",
#[rustc_clean(label="Hir", cfg="cfail3")] except="HirBody,TypeckTables,MirValidated,MirOptimized")]
#[rustc_dirty(label="HirBody", cfg="cfail2")] #[rustc_clean(cfg="cfail3")]
#[rustc_clean(label="HirBody", cfg="cfail3")]
#[rustc_metadata_clean(cfg="cfail2")] #[rustc_metadata_clean(cfg="cfail2")]
#[rustc_metadata_clean(cfg="cfail3")] #[rustc_metadata_clean(cfg="cfail3")]
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
#[rustc_clean(label="MirValidated", cfg="cfail3")]
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
#[rustc_clean(label="FnSignature", cfg="cfail2")]
#[rustc_clean(label="FnSignature", cfg="cfail3")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
pub fn change_mutability_of_slot() { pub fn change_mutability_of_slot() {
let _x: u64 = 0; let _x: u64 = 0;
} }
@ -197,26 +120,11 @@ pub fn change_simple_binding_to_pattern() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(label="Hir", cfg="cfail2")] #[rustc_clean(cfg="cfail2",
#[rustc_clean(label="Hir", cfg="cfail3")] except="HirBody,TypeckTables,MirValidated,MirOptimized")]
#[rustc_dirty(label="HirBody", cfg="cfail2")] #[rustc_clean(cfg="cfail3")]
#[rustc_clean(label="HirBody", cfg="cfail3")]
#[rustc_metadata_clean(cfg="cfail2")] #[rustc_metadata_clean(cfg="cfail2")]
#[rustc_metadata_clean(cfg="cfail3")] #[rustc_metadata_clean(cfg="cfail3")]
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
#[rustc_clean(label="MirValidated", cfg="cfail3")]
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
#[rustc_clean(label="FnSignature", cfg="cfail2")]
#[rustc_clean(label="FnSignature", cfg="cfail3")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
pub fn change_simple_binding_to_pattern() { pub fn change_simple_binding_to_pattern() {
let (_a, _b) = (0u8, 'x'); let (_a, _b) = (0u8, 'x');
} }
@ -230,26 +138,11 @@ pub fn change_name_in_pattern() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(label="Hir", cfg="cfail2")] #[rustc_clean(cfg="cfail2",
#[rustc_clean(label="Hir", cfg="cfail3")] except="HirBody,MirValidated,MirOptimized")]
#[rustc_dirty(label="HirBody", cfg="cfail2")] #[rustc_clean(cfg="cfail3")]
#[rustc_clean(label="HirBody", cfg="cfail3")]
#[rustc_metadata_clean(cfg="cfail2")] #[rustc_metadata_clean(cfg="cfail2")]
#[rustc_metadata_clean(cfg="cfail3")] #[rustc_metadata_clean(cfg="cfail3")]
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
#[rustc_clean(label="MirValidated", cfg="cfail3")]
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
#[rustc_clean(label="FnSignature", cfg="cfail2")]
#[rustc_clean(label="FnSignature", cfg="cfail3")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
pub fn change_name_in_pattern() { pub fn change_name_in_pattern() {
let (_a, _c) = (1u8, 'y'); let (_a, _c) = (1u8, 'y');
} }
@ -263,26 +156,11 @@ pub fn add_ref_in_pattern() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(label="Hir", cfg="cfail2")] #[rustc_clean(cfg="cfail2",
#[rustc_clean(label="Hir", cfg="cfail3")] except="HirBody,TypeckTables,MirValidated,MirOptimized")]
#[rustc_dirty(label="HirBody", cfg="cfail2")] #[rustc_clean(cfg="cfail3")]
#[rustc_clean(label="HirBody", cfg="cfail3")]
#[rustc_metadata_clean(cfg="cfail2")] #[rustc_metadata_clean(cfg="cfail2")]
#[rustc_metadata_clean(cfg="cfail3")] #[rustc_metadata_clean(cfg="cfail3")]
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
#[rustc_clean(label="MirValidated", cfg="cfail3")]
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
#[rustc_clean(label="FnSignature", cfg="cfail2")]
#[rustc_clean(label="FnSignature", cfg="cfail3")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
pub fn add_ref_in_pattern() { pub fn add_ref_in_pattern() {
let (ref _a, _b) = (1u8, 'y'); let (ref _a, _b) = (1u8, 'y');
} }
@ -296,18 +174,11 @@ pub fn add_amp_in_pattern() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(label="Hir", cfg="cfail2")] #[rustc_clean(cfg="cfail2",
#[rustc_clean(label="Hir", cfg="cfail3")] except="HirBody,TypeckTables,MirValidated,MirOptimized")]
#[rustc_dirty(label="HirBody", cfg="cfail2")] #[rustc_clean(cfg="cfail3")]
#[rustc_clean(label="HirBody", cfg="cfail3")]
#[rustc_metadata_clean(cfg="cfail2")] #[rustc_metadata_clean(cfg="cfail2")]
#[rustc_metadata_clean(cfg="cfail3")] #[rustc_metadata_clean(cfg="cfail3")]
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
#[rustc_clean(label="MirValidated", cfg="cfail3")]
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
pub fn add_amp_in_pattern() { pub fn add_amp_in_pattern() {
let (&_a, _b) = (&1u8, 'y'); let (&_a, _b) = (&1u8, 'y');
} }
@ -321,26 +192,11 @@ pub fn change_mutability_of_binding_in_pattern() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(label="Hir", cfg="cfail2")] #[rustc_clean(cfg="cfail2",
#[rustc_clean(label="Hir", cfg="cfail3")] except="HirBody,TypeckTables,MirValidated,MirOptimized")]
#[rustc_dirty(label="HirBody", cfg="cfail2")] #[rustc_clean(cfg="cfail3")]
#[rustc_clean(label="HirBody", cfg="cfail3")]
#[rustc_metadata_clean(cfg="cfail2")] #[rustc_metadata_clean(cfg="cfail2")]
#[rustc_metadata_clean(cfg="cfail3")] #[rustc_metadata_clean(cfg="cfail3")]
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
#[rustc_clean(label="MirValidated", cfg="cfail3")]
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
#[rustc_clean(label="FnSignature", cfg="cfail2")]
#[rustc_clean(label="FnSignature", cfg="cfail3")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
pub fn change_mutability_of_binding_in_pattern() { pub fn change_mutability_of_binding_in_pattern() {
let (mut _a, _b) = (99u8, 'q'); let (mut _a, _b) = (99u8, 'q');
} }
@ -354,26 +210,11 @@ pub fn add_initializer() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(label="Hir", cfg="cfail2")] #[rustc_clean(cfg="cfail2",
#[rustc_clean(label="Hir", cfg="cfail3")] except="HirBody,TypeckTables,MirValidated,MirOptimized")]
#[rustc_dirty(label="HirBody", cfg="cfail2")] #[rustc_clean(cfg="cfail3")]
#[rustc_clean(label="HirBody", cfg="cfail3")]
#[rustc_metadata_clean(cfg="cfail2")] #[rustc_metadata_clean(cfg="cfail2")]
#[rustc_metadata_clean(cfg="cfail3")] #[rustc_metadata_clean(cfg="cfail3")]
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
#[rustc_clean(label="MirValidated", cfg="cfail3")]
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
#[rustc_clean(label="FnSignature", cfg="cfail2")]
#[rustc_clean(label="FnSignature", cfg="cfail3")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
pub fn add_initializer() { pub fn add_initializer() {
let _x: i16 = 3i16; let _x: i16 = 3i16;
} }
@ -387,26 +228,11 @@ pub fn change_initializer() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(label="Hir", cfg="cfail2")] #[rustc_clean(cfg="cfail2",
#[rustc_clean(label="Hir", cfg="cfail3")] except="HirBody,MirValidated,MirOptimized")]
#[rustc_dirty(label="HirBody", cfg="cfail2")] #[rustc_clean(cfg="cfail3")]
#[rustc_clean(label="HirBody", cfg="cfail3")]
#[rustc_metadata_clean(cfg="cfail2")] #[rustc_metadata_clean(cfg="cfail2")]
#[rustc_metadata_clean(cfg="cfail3")] #[rustc_metadata_clean(cfg="cfail3")]
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
#[rustc_clean(label="MirValidated", cfg="cfail3")]
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
#[rustc_clean(label="FnSignature", cfg="cfail2")]
#[rustc_clean(label="FnSignature", cfg="cfail3")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
pub fn change_initializer() { pub fn change_initializer() {
let _x = 5u16; let _x = 5u16;
} }