Rollup merge of #37654 - michaelwoerister:test-let-ich, r=nikomatsakis

ICH: Add tests for let- and match-expressions.

r? @nikomatsakis

src/test/incremental/hashes/let_expressions.rs

+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+
+// This test case tests the incremental compilation hash (ICH) implementation
+// for let expressions.
+
+// The general pattern followed here is: Change one thing between rev1 and rev2
+// and make sure that the hash has changed, then change nothing between rev2 and
+// rev3 and make sure that the hash has not changed.
+
+// must-compile-successfully
+// revisions: cfail1 cfail2 cfail3
+// compile-flags: -Z query-dep-graph
+
+
+#![allow(warnings)]
+#![feature(rustc_attrs)]
+#![crate_type="rlib"]
+
+// Change Name -----------------------------------------------------------------
+#[cfg(cfail1)]
+pub fn change_name() {
+    let _x = 2u64;
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_name() {
+    let _y = 2u64;
+}
+
+
+
+// Add Type --------------------------------------------------------------------
+#[cfg(cfail1)]
+pub fn add_type() {
+    let _x = 2u32;
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn add_type() {
+    let _x: u32 = 2u32;
+}
+
+
+
+// Change Type -----------------------------------------------------------------
+#[cfg(cfail1)]
+pub fn change_type() {
+    let _x: u64 = 2;
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_type() {
+    let _x: u8 = 2;
+}
+
+
+
+// Change Mutability of Reference Type -----------------------------------------
+#[cfg(cfail1)]
+pub fn change_mutability_of_reference_type() {
+    let _x: &u64;
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_mutability_of_reference_type() {
+    let _x: &mut u64;
+}
+
+
+
+// Change Mutability of Slot ---------------------------------------------------
+#[cfg(cfail1)]
+pub fn change_mutability_of_slot() {
+    let mut _x: u64 = 0;
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_mutability_of_slot() {
+    let _x: u64 = 0;
+}
+
+
+
+// Change Simple Binding to Pattern --------------------------------------------
+#[cfg(cfail1)]
+pub fn change_simple_binding_to_pattern() {
+    let _x = (0u8, 'x');
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_simple_binding_to_pattern() {
+    let (_a, _b) = (0u8, 'x');
+}
+
+
+
+// Change Name in Pattern ------------------------------------------------------
+#[cfg(cfail1)]
+pub fn change_name_in_pattern() {
+    let (_a, _b) = (1u8, 'y');
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_name_in_pattern() {
+    let (_a, _c) = (1u8, 'y');
+}
+
+
+
+// Add `ref` in Pattern --------------------------------------------------------
+#[cfg(cfail1)]
+pub fn add_ref_in_pattern() {
+    let (_a, _b) = (1u8, 'y');
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn add_ref_in_pattern() {
+    let (ref _a, _b) = (1u8, 'y');
+}
+
+
+
+// Add `&` in Pattern ----------------------------------------------------------
+#[cfg(cfail1)]
+pub fn add_amp_in_pattern() {
+    let (_a, _b) = (&1u8, 'y');
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn add_amp_in_pattern() {
+    let (&_a, _b) = (&1u8, 'y');
+}
+
+
+
+// Change Mutability of Binding in Pattern -------------------------------------
+#[cfg(cfail1)]
+pub fn change_mutability_of_binding_in_pattern() {
+    let (_a, _b) = (99u8, 'q');
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_mutability_of_binding_in_pattern() {
+    let (mut _a, _b) = (99u8, 'q');
+}
+
+
+
+// Add Initializer -------------------------------------------------------------
+#[cfg(cfail1)]
+pub fn add_initializer() {
+    let _x: i16;
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn add_initializer() {
+    let _x: i16 = 3i16;
+}
+
+
+
+// Change Initializer ----------------------------------------------------------
+#[cfg(cfail1)]
+pub fn change_initializer() {
+    let _x = 4u16;
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_initializer() {
+    let _x = 5u16;
+}

src/test/incremental/hashes/match_expressions.rs

+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+
+// This test case tests the incremental compilation hash (ICH) implementation
+// for match expressions.
+
+// The general pattern followed here is: Change one thing between rev1 and rev2
+// and make sure that the hash has changed, then change nothing between rev2 and
+// rev3 and make sure that the hash has not changed.
+
+// must-compile-successfully
+// revisions: cfail1 cfail2 cfail3
+// compile-flags: -Z query-dep-graph
+
+
+#![allow(warnings)]
+#![feature(rustc_attrs)]
+#![crate_type="rlib"]
+
+// Add Arm ---------------------------------------------------------------------
+#[cfg(cfail1)]
+pub fn add_arm(x: u32) -> u32 {
+    match x {
+        0 => 0,
+        1 => 1,
+        _ => 100,
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn add_arm(x: u32) -> u32 {
+    match x {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        _ => 100,
+    }
+}
+
+
+
+// Change Order Of Arms --------------------------------------------------------
+#[cfg(cfail1)]
+pub fn change_order_of_arms(x: u32) -> u32 {
+    match x {
+        0 => 0,
+        1 => 1,
+        _ => 100,
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_order_of_arms(x: u32) -> u32 {
+    match x {
+        1 => 1,
+        0 => 0,
+        _ => 100,
+    }
+}
+
+
+
+// Add Guard Clause ------------------------------------------------------------
+#[cfg(cfail1)]
+pub fn add_guard_clause(x: u32, y: bool) -> u32 {
+    match x {
+        0 => 0,
+        1 => 1,
+        _ => 100,
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn add_guard_clause(x: u32, y: bool) -> u32 {
+    match x {
+        0 => 0,
+        1 if y => 1,
+        _ => 100,
+    }
+}
+
+
+
+// Change Guard Clause ------------------------------------------------------------
+#[cfg(cfail1)]
+pub fn change_guard_clause(x: u32, y: bool) -> u32 {
+    match x {
+        0 => 0,
+        1 if y => 1,
+        _ => 100,
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_guard_clause(x: u32, y: bool) -> u32 {
+    match x {
+        0 => 0,
+        1 if !y => 1,
+        _ => 100,
+    }
+}
+
+
+
+// Add @-Binding ---------------------------------------------------------------
+#[cfg(cfail1)]
+pub fn add_at_binding(x: u32) -> u32 {
+    match x {
+        0 => 0,
+        1 => 1,
+        _ => x,
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn add_at_binding(x: u32) -> u32 {
+    match x {
+        0 => 0,
+        1 => 1,
+        x @ _ => x,
+    }
+}
+
+
+
+// Change Name of @-Binding ----------------------------------------------------
+#[cfg(cfail1)]
+pub fn change_name_of_at_binding(x: u32) -> u32 {
+    match x {
+        0 => 0,
+        1 => 1,
+        x @ _ => 7,
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_name_of_at_binding(x: u32) -> u32 {
+    match x {
+        0 => 0,
+        1 => 1,
+        y @ _ => 7,
+    }
+}
+
+
+
+// Change Simple Binding To Pattern --------------------------------------------
+#[cfg(cfail1)]
+pub fn change_simple_name_to_pattern(x: u32) -> u32 {
+    match (x, x & 1) {
+        (0, 0) => 0,
+        a      => 1
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_simple_name_to_pattern(x: u32) -> u32 {
+    match (x, x & 1) {
+        (0, 0) => 0,
+        (x, y) => 1
+    }
+}
+
+
+
+// Change Name In Pattern ------------------------------------------------------
+#[cfg(cfail1)]
+pub fn change_name_in_pattern(x: u32) -> u32 {
+    match (x, x & 1) {
+        (a, 0) => 0,
+        (a, 1) => a,
+        _ => 100,
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_name_in_pattern(x: u32) -> u32 {
+    match (x, x & 1) {
+        (b, 0) => 0,
+        (a, 1) => a,
+        _ => 100,
+    }
+}
+
+
+
+// Change Mutability Of Binding In Pattern -------------------------------------
+#[cfg(cfail1)]
+pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
+    match (x, x & 1) {
+        (a, 0) => 0,
+        _      => 1
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
+    match (x, x & 1) {
+        (mut a, 0) => 0,
+        _      => 1
+    }
+}
+
+
+
+// Add `ref` To Binding In Pattern -------------------------------------
+#[cfg(cfail1)]
+pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
+    match (x, x & 1) {
+        (a, 0) => 0,
+        _      => 1
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
+    match (x, x & 1) {
+        (ref a, 0) => 0,
+        _      => 1,
+    }
+}
+
+
+
+// Add `&` To Binding In Pattern -------------------------------------
+#[cfg(cfail1)]
+pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
+    match (&x, x & 1) {
+        (a, 0) => 0,
+        _      => 1
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
+    match (&x, x & 1) {
+        (&a, 0) => 0,
+        _      => 1,
+    }
+}
+
+
+
+// Change RHS Of Arm -----------------------------------------------------------
+#[cfg(cfail1)]
+pub fn change_rhs_of_arm(x: u32) -> u32 {
+    match x {
+        0 => 0,
+        1 => 1,
+        _ => 2,
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn change_rhs_of_arm(x: u32) -> u32 {
+    match x {
+        0 => 0,
+        1 => 3,
+        _ => 2,
+    }
+}
+
+
+
+// Add Alternative To Arm ------------------------------------------------------
+#[cfg(cfail1)]
+pub fn add_alternative_to_arm(x: u32) -> u32 {
+    match x {
+        0 => 0,
+        1 => 1,
+        _ => 2,
+    }
+}
+
+#[cfg(not(cfail1))]
+#[rustc_dirty(label="Hir", cfg="cfail2")]
+#[rustc_clean(label="Hir", cfg="cfail3")]
+#[rustc_metadata_dirty(cfg="cfail2")]
+#[rustc_metadata_clean(cfg="cfail3")]
+pub fn add_alternative_to_arm(x: u32) -> u32 {
+    match x {
+        0 | 7 => 0,
+        1 => 3,
+        _ => 2,
+    }
+}