Skip to content

Commit 4ed91e2

Browse files
cjgillotcjgillot
committed
Bless incremental tests.
1 parent 9c9243f commit 4ed91e2

File tree

4 files changed

+42
-42
lines changed

4 files changed

+42
-42
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ pub fn type_parameter<T>() {}
158158
pub fn lifetime_parameter () {}
159159

160160
#[cfg(not(any(cfail1,cfail4)))]
161-
#[rustc_clean(cfg = "cfail2", except = "hir_owner, hir_owner_nodes, generics_of,fn_sig")]
161+
#[rustc_clean(cfg = "cfail2", except = "hir_owner, hir_owner_nodes, generics_of, type_of")]
162162
#[rustc_clean(cfg = "cfail3")]
163-
#[rustc_clean(cfg = "cfail5", except = "hir_owner, hir_owner_nodes, generics_of,fn_sig")]
163+
#[rustc_clean(cfg = "cfail5", except = "hir_owner, hir_owner_nodes, generics_of, type_of")]
164164
#[rustc_clean(cfg = "cfail6")]
165165
pub fn lifetime_parameter<'a>() {}
166166

@@ -194,12 +194,12 @@ pub fn lifetime_bound<'a, T>() {}
194194
#[cfg(not(any(cfail1,cfail4)))]
195195
#[rustc_clean(
196196
cfg = "cfail2",
197-
except = "hir_owner, hir_owner_nodes, generics_of, type_of, predicates_of,fn_sig"
197+
except = "hir_owner, hir_owner_nodes, generics_of, type_of, predicates_of"
198198
)]
199199
#[rustc_clean(cfg = "cfail3")]
200200
#[rustc_clean(
201201
cfg = "cfail5",
202-
except = "hir_owner, hir_owner_nodes, generics_of, type_of, predicates_of,fn_sig,optimized_mir"
202+
except = "hir_owner, hir_owner_nodes, generics_of, type_of, predicates_of, optimized_mir"
203203
)]
204204
#[rustc_clean(cfg = "cfail6")]
205205
pub fn lifetime_bound<'a, T: 'a>() {}
@@ -234,12 +234,12 @@ pub fn second_lifetime_bound<'a, 'b, T: 'a >() {}
234234
#[cfg(not(any(cfail1,cfail4)))]
235235
#[rustc_clean(
236236
cfg = "cfail2",
237-
except = "hir_owner, hir_owner_nodes, generics_of, type_of, predicates_of,fn_sig"
237+
except = "hir_owner, hir_owner_nodes, generics_of, type_of, predicates_of"
238238
)]
239239
#[rustc_clean(cfg = "cfail3")]
240240
#[rustc_clean(
241241
cfg = "cfail5",
242-
except = "hir_owner, hir_owner_nodes, generics_of, type_of, predicates_of,fn_sig"
242+
except = "hir_owner, hir_owner_nodes, generics_of, type_of, predicates_of"
243243
)]
244244
#[rustc_clean(cfg = "cfail6")]
245245
pub fn second_lifetime_bound<'a, 'b, T: 'a + 'b>() {}

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ impl Foo {
141141
impl Foo {
142142
//------------
143143
//---------------
144-
//---------------------------------------------------------------------------------------------
144+
//-----------------------------------------------------------------------------------------------------
145145
//
146146
//--------------------------
147147
//------------
148148
//---------------
149-
//---------------------------------------------------------------------------------------------
149+
//-----------------------------------------------------------------------------------------------------
150150
//
151151
//--------------------------
152152
pub fn method_selfness() { }
@@ -160,12 +160,12 @@ impl Foo {
160160
impl Foo {
161161
#[rustc_clean(
162162
cfg="cfail2",
163-
except="hir_owner,hir_owner_nodes,fn_sig,generics_of,typeck,associated_item,optimized_mir",
163+
except="hir_owner,hir_owner_nodes,type_of,fn_sig,generics_of,typeck,associated_item,optimized_mir",
164164
)]
165165
#[rustc_clean(cfg="cfail3")]
166166
#[rustc_clean(
167167
cfg="cfail5",
168-
except="hir_owner,hir_owner_nodes,fn_sig,generics_of,typeck,associated_item,optimized_mir",
168+
except="hir_owner,hir_owner_nodes,type_of,fn_sig,generics_of,typeck,associated_item,optimized_mir",
169169
)]
170170
#[rustc_clean(cfg="cfail6")]
171171
pub fn method_selfness(&self) { }
@@ -435,9 +435,9 @@ impl Foo {
435435
// ----------------------------------------------------------
436436
// -----------------------------------------------------------
437437
// ----------------------------------------------------------
438-
// --------------------------------------------------------------------
438+
// ----------------------------------------------------------------------------------------
439439
// -------------------------
440-
// --------------------------------------------------------------------------------
440+
// ----------------------------------------------------------------------------------------
441441
// -------------------------
442442
pub fn add_lifetime_parameter_to_method (&self) { }
443443
}
@@ -457,9 +457,9 @@ impl Foo {
457457
// if we lower generics before the body, then the `HirId` for
458458
// things in the body will be affected. So if you start to see
459459
// `typeck` appear dirty, that might be the cause. -nmatsakis
460-
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,fn_sig")]
460+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,type_of,fn_sig,generics_of")]
461461
#[rustc_clean(cfg="cfail3")]
462-
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,fn_sig,generics_of")]
462+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,type_of,fn_sig,generics_of")]
463463
#[rustc_clean(cfg="cfail6")]
464464
pub fn add_lifetime_parameter_to_method<'a>(&self) { }
465465
}
@@ -480,12 +480,12 @@ impl Foo {
480480
// -------------------------------------------------
481481
// -----------
482482
// --------------
483-
// ----------------------------------------------------------------------
483+
// -----------------------------------------------------------------------------
484484
//
485485
// -------------------------
486486
// -----------
487487
// --------------
488-
// ----------------------------------------------------------------------
488+
// -----------------------------------------------------------------------------
489489
//
490490
// -------------------------
491491
pub fn add_type_parameter_to_method (&self) { }
@@ -508,12 +508,12 @@ impl Foo {
508508
// appear dirty, that might be the cause. -nmatsakis
509509
#[rustc_clean(
510510
cfg="cfail2",
511-
except="hir_owner,hir_owner_nodes,generics_of,predicates_of,type_of",
511+
except="hir_owner,hir_owner_nodes,fn_sig,generics_of,predicates_of,type_of",
512512
)]
513513
#[rustc_clean(cfg="cfail3")]
514514
#[rustc_clean(
515515
cfg="cfail5",
516-
except="hir_owner,hir_owner_nodes,generics_of,predicates_of,type_of",
516+
except="hir_owner,hir_owner_nodes,fn_sig,generics_of,predicates_of,type_of",
517517
)]
518518
#[rustc_clean(cfg="cfail6")]
519519
pub fn add_type_parameter_to_method<T>(&self) { }
@@ -526,12 +526,12 @@ impl Foo {
526526
impl Foo {
527527
//------------
528528
//---------------
529-
//-----------------------------------------------------------------------------
529+
//--------------------------------------------------------------
530530
//
531531
//--------------------------
532532
//------------
533533
//---------------
534-
//-----------------------------------------------------------------------------
534+
//--------------------------------------------------------------
535535
//
536536
//--------------------------
537537
pub fn add_lifetime_bound_to_lifetime_param_of_method<'a, 'b >(&self) { }
@@ -545,12 +545,12 @@ impl Foo {
545545
impl Foo {
546546
#[rustc_clean(
547547
cfg="cfail2",
548-
except="hir_owner,hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig"
548+
except="hir_owner,hir_owner_nodes,generics_of,predicates_of"
549549
)]
550550
#[rustc_clean(cfg="cfail3")]
551551
#[rustc_clean(
552552
cfg="cfail5",
553-
except="hir_owner,hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig"
553+
except="hir_owner,hir_owner_nodes,generics_of,predicates_of"
554554
)]
555555
#[rustc_clean(cfg="cfail6")]
556556
pub fn add_lifetime_bound_to_lifetime_param_of_method<'a, 'b: 'a>(&self) { }
@@ -572,12 +572,12 @@ impl Foo {
572572
// -------------------------------------------------
573573
// -----------
574574
// --------------
575-
// ----------------------------------------------------------------------------
575+
// ---------------------------------------------------------------------
576576
//
577577
// -------------------------
578578
// -----------
579579
// --------------
580-
// ----------------------------------------------------------------------------
580+
// ---------------------------------------------------------------------
581581
//
582582
// -------------------------
583583
pub fn add_lifetime_bound_to_type_param_of_method<'a, T >(&self) { }
@@ -600,12 +600,12 @@ impl Foo {
600600
// appear dirty, that might be the cause. -nmatsakis
601601
#[rustc_clean(
602602
cfg="cfail2",
603-
except="hir_owner,hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig"
603+
except="hir_owner,hir_owner_nodes,generics_of,predicates_of,type_of"
604604
)]
605605
#[rustc_clean(cfg="cfail3")]
606606
#[rustc_clean(
607607
cfg="cfail5",
608-
except="hir_owner,hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig"
608+
except="hir_owner,hir_owner_nodes,generics_of,predicates_of,type_of"
609609
)]
610610
#[rustc_clean(cfg="cfail6")]
611611
pub fn add_lifetime_bound_to_type_param_of_method<'a, T: 'a>(&self) { }

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,9 @@ trait TraitChangeModeSelfOwnToMut: Sized {
369369

370370
#[cfg(any(cfail1,cfail4))]
371371
trait TraitChangeModeSelfOwnToRef {
372-
// --------------------------------------------------------------------------------
372+
// ----------------------------------------------------------------------------------------
373373
// -------------------------
374-
// --------------------------------------------------------------------------------
374+
// ----------------------------------------------------------------------------------------
375375
// -------------------------
376376
fn method( self);
377377
}
@@ -382,9 +382,9 @@ trait TraitChangeModeSelfOwnToRef {
382382
#[rustc_clean(cfg="cfail5")]
383383
#[rustc_clean(cfg="cfail6")]
384384
trait TraitChangeModeSelfOwnToRef {
385-
#[rustc_clean(except="hir_owner,hir_owner_nodes,fn_sig,generics_of", cfg="cfail2")]
385+
#[rustc_clean(except="hir_owner,hir_owner_nodes,fn_sig,type_of,generics_of", cfg="cfail2")]
386386
#[rustc_clean(cfg="cfail3")]
387-
#[rustc_clean(except="hir_owner,hir_owner_nodes,fn_sig,generics_of", cfg="cfail5")]
387+
#[rustc_clean(except="hir_owner,hir_owner_nodes,fn_sig,type_of,generics_of", cfg="cfail5")]
388388
#[rustc_clean(cfg="cfail6")]
389389
fn method(&self);
390390
}
@@ -498,9 +498,9 @@ trait TraitAddTypeParameterToMethod {
498498
// Add lifetime parameter to method
499499
#[cfg(any(cfail1,cfail4))]
500500
trait TraitAddLifetimeParameterToMethod {
501-
// --------------------------------------------------------------------------------
501+
// ---------------------------------------------------------------------------------
502502
// -------------------------
503-
// --------------------------------------------------------------------------------
503+
// ---------------------------------------------------------------------------------
504504
// -------------------------
505505
fn method ();
506506
}
@@ -511,9 +511,9 @@ trait TraitAddLifetimeParameterToMethod {
511511
#[rustc_clean(cfg="cfail5")]
512512
#[rustc_clean(cfg="cfail6")]
513513
trait TraitAddLifetimeParameterToMethod {
514-
#[rustc_clean(except="hir_owner,hir_owner_nodes,fn_sig,generics_of", cfg="cfail2")]
514+
#[rustc_clean(except="hir_owner,hir_owner_nodes,type_of,generics_of", cfg="cfail2")]
515515
#[rustc_clean(cfg="cfail3")]
516-
#[rustc_clean(except="hir_owner,hir_owner_nodes,fn_sig,generics_of", cfg="cfail5")]
516+
#[rustc_clean(except="hir_owner,hir_owner_nodes,type_of,generics_of", cfg="cfail5")]
517517
#[rustc_clean(cfg="cfail6")]
518518
fn method<'a>();
519519
}
@@ -578,12 +578,12 @@ trait TraitAddBuiltinBoundToMethodTypeParameter {
578578
#[cfg(any(cfail1,cfail4))]
579579
trait TraitAddLifetimeBoundToMethodLifetimeParameter {
580580
// -----------
581-
// -----------------------------------------------------------------------------
581+
// --------------------------------------------------------------
582582
// --------------
583583
//
584584
// -------------------------
585585
// -----------
586-
// -----------------------------------------------------------------------------
586+
// --------------------------------------------------------------
587587
// --------------
588588
//
589589
// -------------------------
@@ -597,12 +597,12 @@ trait TraitAddLifetimeBoundToMethodLifetimeParameter {
597597
#[rustc_clean(cfg="cfail6")]
598598
trait TraitAddLifetimeBoundToMethodLifetimeParameter {
599599
#[rustc_clean(
600-
except="hir_owner,hir_owner_nodes,generics_of,predicates_of,fn_sig,type_of",
600+
except="hir_owner,hir_owner_nodes,generics_of,predicates_of",
601601
cfg="cfail2",
602602
)]
603603
#[rustc_clean(cfg="cfail3")]
604604
#[rustc_clean(
605-
except="hir_owner,hir_owner_nodes,generics_of,predicates_of,fn_sig,type_of",
605+
except="hir_owner,hir_owner_nodes,generics_of,predicates_of",
606606
cfg="cfail5",
607607
)]
608608
#[rustc_clean(cfg="cfail6")]

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@ pub trait ChangeMethodSelfnessTrait {
150150
#[rustc_clean(cfg="cfail6")]
151151
impl ChangeMethodSelfnessTrait for Foo {
152152
#[rustc_clean(
153-
except="hir_owner,hir_owner_nodes,associated_item,generics_of,fn_sig,typeck,optimized_mir",
153+
except="hir_owner,hir_owner_nodes,associated_item,generics_of,type_of,fn_sig,typeck,optimized_mir",
154154
cfg="cfail2",
155155
)]
156156
#[rustc_clean(cfg="cfail3")]
157157
#[rustc_clean(
158-
except="hir_owner,hir_owner_nodes,associated_item,generics_of,fn_sig,typeck,optimized_mir",
158+
except="hir_owner,hir_owner_nodes,associated_item,generics_of,type_of,fn_sig,typeck,optimized_mir",
159159
cfg="cfail5",
160160
)]
161161
#[rustc_clean(cfg="cfail6")]
@@ -188,12 +188,12 @@ pub trait RemoveMethodSelfnessTrait {
188188
#[rustc_clean(cfg="cfail6")]
189189
impl RemoveMethodSelfnessTrait for Foo {
190190
#[rustc_clean(
191-
except="hir_owner,hir_owner_nodes,associated_item,generics_of,fn_sig,typeck,optimized_mir",
191+
except="hir_owner,hir_owner_nodes,associated_item,generics_of,type_of,fn_sig,typeck,optimized_mir",
192192
cfg="cfail2",
193193
)]
194194
#[rustc_clean(cfg="cfail3")]
195195
#[rustc_clean(
196-
except="hir_owner,hir_owner_nodes,associated_item,generics_of,fn_sig,typeck,optimized_mir",
196+
except="hir_owner,hir_owner_nodes,associated_item,generics_of,type_of,fn_sig,typeck,optimized_mir",
197197
cfg="cfail5",
198198
)]
199199
#[rustc_clean(cfg="cfail6")]

0 commit comments

Comments
 (0)