Bless incremental tests.

diff --git a/src/test/incremental/hashes/inherent_impls.rs b/src/test/incremental/hashes/inherent_impls.rs
index 69883058335f0566486a9ced7cdd10d412b1ee46..1abbff32c6f349ece60c2d60622a4bf3c6bc85e6 100644 (file)
--- a/src/test/incremental/hashes/inherent_impls.rs
+++ b/src/test/incremental/hashes/inherent_impls.rs
@@ -116,9 +116,9 @@ pub fn method_body_inlined() {
 // Change Method Privacy -------------------------------------------------------
 #[cfg(any(cfail1,cfail4))]
 impl Foo {
 // Change Method Privacy -------------------------------------------------------
 #[cfg(any(cfail1,cfail4))]
 impl Foo {

-    //----------------------------------------------------

     //--------------------------
     //--------------------------

-    //------------------------------------------------------------------------------
+    //--------------------------
+    //--------------------------------------------------------------

     //--------------------------
     pub fn method_privacy() { }
 }
     //--------------------------
     pub fn method_privacy() { }
 }


@@ -129,9 +129,9 @@ pub fn method_privacy() { }
 #[rustc_clean(cfg="cfail5")]
 #[rustc_clean(cfg="cfail6")]
 impl Foo {
 #[rustc_clean(cfg="cfail5")]
 #[rustc_clean(cfg="cfail6")]
 impl Foo {

-    #[rustc_clean(cfg="cfail2", except="associated_item")]
+    #[rustc_clean(cfg="cfail2")]

     #[rustc_clean(cfg="cfail3")]
     #[rustc_clean(cfg="cfail3")]

-    #[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,associated_item")]
+    #[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes")]

     #[rustc_clean(cfg="cfail6")]
     fn     method_privacy() { }
 }
     #[rustc_clean(cfg="cfail6")]
     fn     method_privacy() { }
 }

diff --git a/src/test/incremental/hashes/trait_defs.rs b/src/test/incremental/hashes/trait_defs.rs
index 9b79fd8a0a105fe71f85a13f46e6f7b3ef479cd5..1988f3f35417cbc94be1426148328e0bdd54cf0e 100644 (file)
--- a/src/test/incremental/hashes/trait_defs.rs
+++ b/src/test/incremental/hashes/trait_defs.rs
@@ -277,22 +277,22 @@ trait TraitChangeMethodParametersOrder {
 // Add default implementation to method
 #[cfg(any(cfail1,cfail4))]
 trait TraitAddMethodAutoImplementation {
 // Add default implementation to method
 #[cfg(any(cfail1,cfail4))]
 trait TraitAddMethodAutoImplementation {

-    // -----------------------------------------------------------------------------
+    // -------------------------------------------------------------

     // -------------------------
     // -------------------------

-    // -----------------------------------------------------------------------------
+    // -------------------------------------------------------------

     // -------------------------
     fn method()  ;
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
     // -------------------------
     fn method()  ;
 }
 
 #[cfg(not(any(cfail1,cfail4)))]

-#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
+#[rustc_clean(except="hir_owner_nodes", cfg="cfail2")]

 #[rustc_clean(cfg="cfail3")]
 #[rustc_clean(cfg="cfail3")]

-#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
+#[rustc_clean(except="hir_owner_nodes", cfg="cfail5")]

 #[rustc_clean(cfg="cfail6")]
 trait TraitAddMethodAutoImplementation {
 #[rustc_clean(cfg="cfail6")]
 trait TraitAddMethodAutoImplementation {

-    #[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail2")]
+    #[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]

     #[rustc_clean(cfg="cfail3")]
     #[rustc_clean(cfg="cfail3")]

-    #[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail5")]
+    #[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]

     #[rustc_clean(cfg="cfail6")]
     fn method() {}
 }
     #[rustc_clean(cfg="cfail6")]
     fn method() {}
 }


@@ -795,20 +795,24 @@ trait TraitAddLifetimeBoundToAssociatedType<'a> {
 // Add default to associated type
 #[cfg(any(cfail1,cfail4))]
 trait TraitAddDefaultToAssociatedType {
 // Add default to associated type
 #[cfg(any(cfail1,cfail4))]
 trait TraitAddDefaultToAssociatedType {

-    type Associated;
+    //--------------------------------------------------------------
+    //--------------------------
+    //--------------------------------------------------------------
+    //--------------------------
+    type Associated                 ;

 
     fn method();
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
 
     fn method();
 }
 
 #[cfg(not(any(cfail1,cfail4)))]

-#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
+#[rustc_clean(except="hir_owner_nodes", cfg="cfail2")]

 #[rustc_clean(cfg="cfail3")]
 #[rustc_clean(cfg="cfail3")]

-#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
+#[rustc_clean(except="hir_owner_nodes", cfg="cfail5")]

 #[rustc_clean(cfg="cfail6")]
 trait TraitAddDefaultToAssociatedType {
 #[rustc_clean(cfg="cfail6")]
 trait TraitAddDefaultToAssociatedType {

-    #[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail2")]
+    #[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]

     #[rustc_clean(cfg="cfail3")]
     #[rustc_clean(cfg="cfail3")]

-    #[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail5")]
+    #[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]

     #[rustc_clean(cfg="cfail6")]
     type Associated = ReferenceType0;
 
     #[rustc_clean(cfg="cfail6")]
     type Associated = ReferenceType0;
 


@@ -839,20 +843,28 @@ trait TraitAddAssociatedConstant {
 // Add initializer to associated constant
 #[cfg(any(cfail1,cfail4))]
 trait TraitAddInitializerToAssociatedConstant {
 // Add initializer to associated constant
 #[cfg(any(cfail1,cfail4))]
 trait TraitAddInitializerToAssociatedConstant {

-    const Value: u32;
+    //--------------------------------------------------------------
+    //--------------------------
+    //--------------------------------------------------------------
+    //--------------------------
+    const Value: u32    ;

 
 

+    //--------------------------
+    //--------------------------
+    //--------------------------
+    //--------------------------

     fn method();
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
     fn method();
 }
 
 #[cfg(not(any(cfail1,cfail4)))]

-#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
+#[rustc_clean(except="hir_owner_nodes", cfg="cfail2")]

 #[rustc_clean(cfg="cfail3")]
 #[rustc_clean(cfg="cfail3")]

-#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
+#[rustc_clean(except="hir_owner_nodes", cfg="cfail5")]

 #[rustc_clean(cfg="cfail6")]
 trait TraitAddInitializerToAssociatedConstant {
 #[rustc_clean(cfg="cfail6")]
 trait TraitAddInitializerToAssociatedConstant {

-    #[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail2")]
+    #[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]

     #[rustc_clean(cfg="cfail3")]
     #[rustc_clean(cfg="cfail3")]

-    #[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail5")]
+    #[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]

     #[rustc_clean(cfg="cfail6")]
     const Value: u32 = 1;
 
     #[rustc_clean(cfg="cfail6")]
     const Value: u32 = 1;
 

diff --git a/src/test/incremental/hashes/trait_impls.rs b/src/test/incremental/hashes/trait_impls.rs
index cc63aa4f5566399f6aa575c2b01769332404a943..f555f555f9236c7c214c78324d5ce8a345ed7094 100644 (file)
--- a/src/test/incremental/hashes/trait_impls.rs
+++ b/src/test/incremental/hashes/trait_impls.rs
@@ -320,7 +320,11 @@ fn method_name() { }
 
 #[cfg(any(cfail1,cfail4))]
 pub trait ChangeHasValueTrait {
 
 #[cfg(any(cfail1,cfail4))]
 pub trait ChangeHasValueTrait {

-    fn method_name();
+    //--------------------------------------------------------------
+    //--------------------------
+    //--------------------------------------------------------------
+    //--------------------------
+    fn method_name()   ;

 }
 
 #[cfg(any(cfail1,cfail4))]
 }
 
 #[cfg(any(cfail1,cfail4))]


@@ -329,14 +333,14 @@ fn method_name() { }
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
 }
 
 #[cfg(not(any(cfail1,cfail4)))]

-#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
+#[rustc_clean(except="hir_owner_nodes", cfg="cfail2")]

 #[rustc_clean(cfg="cfail3")]
 #[rustc_clean(cfg="cfail3")]

-#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
+#[rustc_clean(except="hir_owner_nodes", cfg="cfail5")]

 #[rustc_clean(cfg="cfail6")]
 pub trait ChangeHasValueTrait {
 #[rustc_clean(cfg="cfail6")]
 pub trait ChangeHasValueTrait {

-    #[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail2")]
+    #[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]

     #[rustc_clean(cfg="cfail3")]
     #[rustc_clean(cfg="cfail3")]

-    #[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail5")]
+    #[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]

     #[rustc_clean(cfg="cfail6")]
     fn method_name() { }
 }
     #[rustc_clean(cfg="cfail6")]
     fn method_name() { }
 }


@@ -358,22 +362,22 @@ pub trait AddDefaultTrait {
 
 #[cfg(any(cfail1,cfail4))]
 impl AddDefaultTrait for Foo {
 
 #[cfg(any(cfail1,cfail4))]
 impl AddDefaultTrait for Foo {

-    // ----------------------------------------------------
+    // -------------------------------------------------------------

     // -------------------------
     // -------------------------

-    // ----------------------------------------------------
+    // -------------------------------------------------------------

     // -------------------------
     fn         method_name() { }
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
     // -------------------------
     fn         method_name() { }
 }
 
 #[cfg(not(any(cfail1,cfail4)))]

-#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
+#[rustc_clean(cfg="cfail2")]

 #[rustc_clean(cfg="cfail3")]
 #[rustc_clean(cfg="cfail3")]

-#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
+#[rustc_clean(cfg="cfail5")]

 #[rustc_clean(cfg="cfail6")]
 impl AddDefaultTrait for Foo {
 #[rustc_clean(cfg="cfail6")]
 impl AddDefaultTrait for Foo {

-    #[rustc_clean(except="associated_item", cfg="cfail2")]
+    #[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]

     #[rustc_clean(cfg="cfail3")]
     #[rustc_clean(cfg="cfail3")]

-    #[rustc_clean(except="associated_item", cfg="cfail5")]
+    #[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]

     #[rustc_clean(cfg="cfail6")]
     default fn method_name() { }
 }
     #[rustc_clean(cfg="cfail6")]
     default fn method_name() { }
 }