Skip to content

Commit 6c5f077

Browse files
cjgillotcjgillot
committed
Bless incremental tests.
1 parent 9575481 commit 6c5f077

File tree

3 files changed

+47
-31
lines changed

3 files changed

+47
-31
lines changed

‎src/test/incremental/hashes/inherent_impls.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ impl Foo {
116116
// Change Method Privacy -------------------------------------------------------
117117
#[cfg(any(cfail1,cfail4))]
118118
impl Foo {
119-
//----------------------------------------------------
120119
//--------------------------
121-
//------------------------------------------------------------------------------
120+
//--------------------------
121+
//--------------------------------------------------------------
122122
//--------------------------
123123
pub fn method_privacy() { }
124124
}
@@ -129,9 +129,9 @@ impl Foo {
129129
#[rustc_clean(cfg="cfail5")]
130130
#[rustc_clean(cfg="cfail6")]
131131
impl Foo {
132-
#[rustc_clean(cfg="cfail2", except="associated_item")]
132+
#[rustc_clean(cfg="cfail2")]
133133
#[rustc_clean(cfg="cfail3")]
134-
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,associated_item")]
134+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes")]
135135
#[rustc_clean(cfg="cfail6")]
136136
fn method_privacy() { }
137137
}

‎src/test/incremental/hashes/trait_defs.rs

+28-16
Original file line numberDiff line numberDiff line change
@@ -277,22 +277,22 @@ trait TraitChangeMethodParametersOrder {
277277
// Add default implementation to method
278278
#[cfg(any(cfail1,cfail4))]
279279
trait TraitAddMethodAutoImplementation {
280-
// -----------------------------------------------------------------------------
280+
// -------------------------------------------------------------
281281
// -------------------------
282-
// -----------------------------------------------------------------------------
282+
// -------------------------------------------------------------
283283
// -------------------------
284284
fn method() ;
285285
}
286286

287287
#[cfg(not(any(cfail1,cfail4)))]
288-
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
288+
#[rustc_clean(except="hir_owner_nodes", cfg="cfail2")]
289289
#[rustc_clean(cfg="cfail3")]
290-
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
290+
#[rustc_clean(except="hir_owner_nodes", cfg="cfail5")]
291291
#[rustc_clean(cfg="cfail6")]
292292
trait TraitAddMethodAutoImplementation {
293-
#[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail2")]
293+
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
294294
#[rustc_clean(cfg="cfail3")]
295-
#[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail5")]
295+
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
296296
#[rustc_clean(cfg="cfail6")]
297297
fn method() {}
298298
}
@@ -795,20 +795,24 @@ trait TraitAddLifetimeBoundToAssociatedType<'a> {
795795
// Add default to associated type
796796
#[cfg(any(cfail1,cfail4))]
797797
trait TraitAddDefaultToAssociatedType {
798-
type Associated;
798+
//--------------------------------------------------------------
799+
//--------------------------
800+
//--------------------------------------------------------------
801+
//--------------------------
802+
type Associated ;
799803

800804
fn method();
801805
}
802806

803807
#[cfg(not(any(cfail1,cfail4)))]
804-
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
808+
#[rustc_clean(except="hir_owner_nodes", cfg="cfail2")]
805809
#[rustc_clean(cfg="cfail3")]
806-
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
810+
#[rustc_clean(except="hir_owner_nodes", cfg="cfail5")]
807811
#[rustc_clean(cfg="cfail6")]
808812
trait TraitAddDefaultToAssociatedType {
809-
#[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail2")]
813+
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
810814
#[rustc_clean(cfg="cfail3")]
811-
#[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail5")]
815+
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
812816
#[rustc_clean(cfg="cfail6")]
813817
type Associated = ReferenceType0;
814818

@@ -839,20 +843,28 @@ trait TraitAddAssociatedConstant {
839843
// Add initializer to associated constant
840844
#[cfg(any(cfail1,cfail4))]
841845
trait TraitAddInitializerToAssociatedConstant {
842-
const Value: u32;
846+
//--------------------------------------------------------------
847+
//--------------------------
848+
//--------------------------------------------------------------
849+
//--------------------------
850+
const Value: u32 ;
843851

852+
//--------------------------
853+
//--------------------------
854+
//--------------------------
855+
//--------------------------
844856
fn method();
845857
}
846858

847859
#[cfg(not(any(cfail1,cfail4)))]
848-
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
860+
#[rustc_clean(except="hir_owner_nodes", cfg="cfail2")]
849861
#[rustc_clean(cfg="cfail3")]
850-
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
862+
#[rustc_clean(except="hir_owner_nodes", cfg="cfail5")]
851863
#[rustc_clean(cfg="cfail6")]
852864
trait TraitAddInitializerToAssociatedConstant {
853-
#[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail2")]
865+
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
854866
#[rustc_clean(cfg="cfail3")]
855-
#[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail5")]
867+
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
856868
#[rustc_clean(cfg="cfail6")]
857869
const Value: u32 = 1;
858870

‎src/test/incremental/hashes/trait_impls.rs

+15-11
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,11 @@ impl AddItemTrait for Foo {
320320

321321
#[cfg(any(cfail1,cfail4))]
322322
pub trait ChangeHasValueTrait {
323-
fn method_name();
323+
//--------------------------------------------------------------
324+
//--------------------------
325+
//--------------------------------------------------------------
326+
//--------------------------
327+
fn method_name() ;
324328
}
325329

326330
#[cfg(any(cfail1,cfail4))]
@@ -329,14 +333,14 @@ impl ChangeHasValueTrait for Foo {
329333
}
330334

331335
#[cfg(not(any(cfail1,cfail4)))]
332-
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
336+
#[rustc_clean(except="hir_owner_nodes", cfg="cfail2")]
333337
#[rustc_clean(cfg="cfail3")]
334-
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
338+
#[rustc_clean(except="hir_owner_nodes", cfg="cfail5")]
335339
#[rustc_clean(cfg="cfail6")]
336340
pub trait ChangeHasValueTrait {
337-
#[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail2")]
341+
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
338342
#[rustc_clean(cfg="cfail3")]
339-
#[rustc_clean(except="hir_owner,hir_owner_nodes,associated_item", cfg="cfail5")]
343+
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
340344
#[rustc_clean(cfg="cfail6")]
341345
fn method_name() { }
342346
}
@@ -358,22 +362,22 @@ pub trait AddDefaultTrait {
358362

359363
#[cfg(any(cfail1,cfail4))]
360364
impl AddDefaultTrait for Foo {
361-
// ----------------------------------------------------
365+
// -------------------------------------------------------------
362366
// -------------------------
363-
// ----------------------------------------------------
367+
// -------------------------------------------------------------
364368
// -------------------------
365369
fn method_name() { }
366370
}
367371

368372
#[cfg(not(any(cfail1,cfail4)))]
369-
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
373+
#[rustc_clean(cfg="cfail2")]
370374
#[rustc_clean(cfg="cfail3")]
371-
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
375+
#[rustc_clean(cfg="cfail5")]
372376
#[rustc_clean(cfg="cfail6")]
373377
impl AddDefaultTrait for Foo {
374-
#[rustc_clean(except="associated_item", cfg="cfail2")]
378+
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail2")]
375379
#[rustc_clean(cfg="cfail3")]
376-
#[rustc_clean(except="associated_item", cfg="cfail5")]
380+
#[rustc_clean(except="hir_owner,hir_owner_nodes", cfg="cfail5")]
377381
#[rustc_clean(cfg="cfail6")]
378382
default fn method_name() { }
379383
}

0 commit comments

Comments
 (0)