Skip to content

Commit bfbd0a5

Browse files
GuillaumeGomezGuillaumeGomez
authored
Rollup merge of #37072 - michaelwoerister:enable-trait-ich-tests, r=nikomatsakis
ICH: Enable some cases in trait definition hashing. Enable some test cases originally written by @eulerdisk. The tests can be enabled now because @MathieuBordere has fixed the underlying problem in #36974. r? @nikomatsakis
2 parents ffa9bbf + f52723c commit bfbd0a5

File tree

1 file changed

+85
-91
lines changed

1 file changed

+85
-91
lines changed

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

Lines changed: 85 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,15 @@ pub trait TraitVisibility { }
4646

4747

4848
// Change trait unsafety ----------------------------------------------------------
49-
// FIXME: this should work but doesn't yet.
50-
// #[cfg(cfail1)]
51-
// trait TraitUnsafety { }
49+
#[cfg(cfail1)]
50+
trait TraitUnsafety { }
5251

53-
// #[cfg(not(cfail1))]
54-
// #[rustc_dirty(label="Hir", cfg="cfail2")]
55-
// #[rustc_clean(label="Hir", cfg="cfail3")]
56-
// #[rustc_metadata_dirty(cfg="cfail2")]
57-
// #[rustc_metadata_clean(cfg="cfail3")]
58-
// unsafe trait TraitUnsafety { }
52+
#[cfg(not(cfail1))]
53+
#[rustc_dirty(label="Hir", cfg="cfail2")]
54+
#[rustc_clean(label="Hir", cfg="cfail3")]
55+
#[rustc_metadata_dirty(cfg="cfail2")]
56+
#[rustc_metadata_clean(cfg="cfail3")]
57+
unsafe trait TraitUnsafety { }
5958

6059

6160

@@ -178,20 +177,19 @@ trait TraitChangeMethodParameterType {
178177

179178

180179
// Change type of method parameter (&i32 => &mut i32) -----------------------------
181-
// FIXME: this should work but doesn't yet.
182-
// #[cfg(cfail1)]
183-
// trait TraitChangeMethodParameterTypeRef {
184-
// fn method(a: &i32);
185-
// }
180+
#[cfg(cfail1)]
181+
trait TraitChangeMethodParameterTypeRef {
182+
fn method(a: &i32);
183+
}
186184

187-
// #[cfg(not(cfail1))]
188-
// #[rustc_dirty(label="Hir", cfg="cfail2")]
189-
// #[rustc_clean(label="Hir", cfg="cfail3")]
190-
// #[rustc_metadata_dirty(cfg="cfail2")]
191-
// #[rustc_metadata_clean(cfg="cfail3")]
192-
// trait TraitChangeMethodParameterTypeRef {
193-
// fn method(a: &mut i32);
194-
// }
185+
#[cfg(not(cfail1))]
186+
#[rustc_dirty(label="Hir", cfg="cfail2")]
187+
#[rustc_clean(label="Hir", cfg="cfail3")]
188+
#[rustc_metadata_dirty(cfg="cfail2")]
189+
#[rustc_metadata_clean(cfg="cfail3")]
190+
trait TraitChangeMethodParameterTypeRef {
191+
fn method(a: &mut i32);
192+
}
195193

196194

197195

@@ -249,35 +247,35 @@ trait TraitChangeOrderOfMethods {
249247

250248

251249
// Change mode of self parameter --------------------------------------------------
252-
// FIXME: this should work but doesn't yet.
253-
// #[cfg(cfail1)]
254-
// trait TraitChangeModeSelfRefToMut {
255-
// fn method(&self);
256-
// }
257-
258-
// #[cfg(not(cfail1))]
259-
// #[rustc_dirty(label="Hir", cfg="cfail2")]
260-
// #[rustc_clean(label="Hir", cfg="cfail3")]
261-
// #[rustc_metadata_dirty(cfg="cfail2")]
262-
// #[rustc_metadata_clean(cfg="cfail3")]
263-
// trait TraitChangeModeSelfRefToMut {
264-
// fn method(&mut self);
265-
// }
266-
267-
// FIXME: this should work but doesn't yet.
268-
// #[cfg(cfail1)]
269-
// trait TraitChangeModeSelfOwnToMut {
270-
// fn method(self);
271-
// }
272-
273-
// #[cfg(not(cfail1))]
274-
// #[rustc_dirty(label="Hir", cfg="cfail2")]
275-
// #[rustc_clean(label="Hir", cfg="cfail3")]
276-
// #[rustc_metadata_dirty(cfg="cfail2")]
277-
// #[rustc_metadata_clean(cfg="cfail3")]
278-
// trait TraitChangeModeSelfOwnToMut {
279-
// fn method(mut self);
280-
// }
250+
#[cfg(cfail1)]
251+
trait TraitChangeModeSelfRefToMut {
252+
fn method(&self);
253+
}
254+
255+
#[cfg(not(cfail1))]
256+
#[rustc_dirty(label="Hir", cfg="cfail2")]
257+
#[rustc_clean(label="Hir", cfg="cfail3")]
258+
#[rustc_metadata_dirty(cfg="cfail2")]
259+
#[rustc_metadata_clean(cfg="cfail3")]
260+
trait TraitChangeModeSelfRefToMut {
261+
fn method(&mut self);
262+
}
263+
264+
265+
266+
#[cfg(cfail1)]
267+
trait TraitChangeModeSelfOwnToMut {
268+
fn method(self);
269+
}
270+
271+
#[cfg(not(cfail1))]
272+
#[rustc_dirty(label="Hir", cfg="cfail2")]
273+
#[rustc_clean(label="Hir", cfg="cfail3")]
274+
#[rustc_metadata_dirty(cfg="cfail2")]
275+
#[rustc_metadata_clean(cfg="cfail3")]
276+
trait TraitChangeModeSelfOwnToMut {
277+
fn method(mut self);
278+
}
281279

282280

283281

@@ -298,56 +296,53 @@ trait TraitChangeModeSelfOwnToRef {
298296

299297

300298
// Add unsafe modifier to method --------------------------------------------------
301-
// FIXME: this should work but doesn't yet.
302-
// #[cfg(cfail1)]
303-
// trait TraitAddUnsafeModifier {
304-
// fn method();
305-
// }
299+
#[cfg(cfail1)]
300+
trait TraitAddUnsafeModifier {
301+
fn method();
302+
}
306303

307-
// #[cfg(not(cfail1))]
308-
// #[rustc_dirty(label="Hir", cfg="cfail2")]
309-
// #[rustc_clean(label="Hir", cfg="cfail3")]
310-
// #[rustc_metadata_dirty(cfg="cfail2")]
311-
// #[rustc_metadata_clean(cfg="cfail3")]
312-
// trait TraitAddUnsafeModifier {
313-
// unsafe fn method();
314-
// }
304+
#[cfg(not(cfail1))]
305+
#[rustc_dirty(label="Hir", cfg="cfail2")]
306+
#[rustc_clean(label="Hir", cfg="cfail3")]
307+
#[rustc_metadata_dirty(cfg="cfail2")]
308+
#[rustc_metadata_clean(cfg="cfail3")]
309+
trait TraitAddUnsafeModifier {
310+
unsafe fn method();
311+
}
315312

316313

317314

318315
// Add extern modifier to method --------------------------------------------------
319-
// FIXME: this should work but doesn't yet.
320-
// #[cfg(cfail1)]
321-
// trait TraitAddExternModifier {
322-
// fn method();
323-
// }
316+
#[cfg(cfail1)]
317+
trait TraitAddExternModifier {
318+
fn method();
319+
}
324320

325-
// #[cfg(not(cfail1))]
326-
// #[rustc_dirty(label="Hir", cfg="cfail2")]
327-
// #[rustc_clean(label="Hir", cfg="cfail3")]
328-
// #[rustc_metadata_dirty(cfg="cfail2")]
329-
// #[rustc_metadata_clean(cfg="cfail3")]
330-
// trait TraitAddExternModifier {
331-
// extern fn method();
332-
// }
321+
#[cfg(not(cfail1))]
322+
#[rustc_dirty(label="Hir", cfg="cfail2")]
323+
#[rustc_clean(label="Hir", cfg="cfail3")]
324+
#[rustc_metadata_dirty(cfg="cfail2")]
325+
#[rustc_metadata_clean(cfg="cfail3")]
326+
trait TraitAddExternModifier {
327+
extern fn method();
328+
}
333329

334330

335331

336332
// Change extern "C" to extern "rust-intrinsic" -----------------------------------
337-
// FIXME: this should work but doesn't yet.
338-
// #[cfg(cfail1)]
339-
// trait TraitChangeExternCToRustIntrinsic {
340-
// extern "C" fn method();
341-
// }
333+
#[cfg(cfail1)]
334+
trait TraitChangeExternCToRustIntrinsic {
335+
extern "C" fn method();
336+
}
342337

343-
// #[cfg(not(cfail1))]
344-
// #[rustc_dirty(label="Hir", cfg="cfail2")]
345-
// #[rustc_clean(label="Hir", cfg="cfail3")]
346-
// #[rustc_metadata_dirty(cfg="cfail2")]
347-
// #[rustc_metadata_clean(cfg="cfail3")]
348-
// trait TraitChangeExternCToRustIntrinsic {
349-
// extern "rust-intrinsic" fn method();
350-
// }
338+
#[cfg(not(cfail1))]
339+
#[rustc_dirty(label="Hir", cfg="cfail2")]
340+
#[rustc_clean(label="Hir", cfg="cfail3")]
341+
#[rustc_metadata_dirty(cfg="cfail2")]
342+
#[rustc_metadata_clean(cfg="cfail3")]
343+
trait TraitChangeExternCToRustIntrinsic {
344+
extern "rust-intrinsic" fn method();
345+
}
351346

352347

353348

@@ -1118,4 +1113,3 @@ mod change_method_type_parameter_bound_indirectly_where {
11181113
fn method(a: T);
11191114
}
11201115
}
1121-

0 commit comments

Comments
 (0)