forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#119248 - lukas-code:purge-unused-outlives-test, r=cjgillot remove dead inferred outlives testing code The `test_inferred_outlives` function was never run, because the code that's actually used for the tests was part of the `inferred_outlives_of` query, which ran before `test_inferred_outlives` during type collecting. This PR separates the test code from the query and moves it inside the dedicated function.
- Loading branch information
Showing
4 changed files
with
20 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
#### This error code is internal to the compiler and will not be emitted with normal Rust code. | ||
#### Note: this error code is no longer emitted by the compiler. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,28 @@ | ||
use rustc_errors::struct_span_err; | ||
use rustc_middle::ty::TyCtxt; | ||
use rustc_middle::ty::{self, TyCtxt}; | ||
use rustc_span::symbol::sym; | ||
|
||
pub fn test_inferred_outlives(tcx: TyCtxt<'_>) { | ||
for id in tcx.hir().items() { | ||
// For unit testing: check for a special "rustc_outlives" | ||
// attribute and report an error with various results if found. | ||
if tcx.has_attr(id.owner_id, sym::rustc_outlives) { | ||
let inferred_outlives_of = tcx.inferred_outlives_of(id.owner_id); | ||
struct_span_err!( | ||
tcx.sess, | ||
tcx.def_span(id.owner_id), | ||
E0640, | ||
"{:?}", | ||
inferred_outlives_of | ||
) | ||
.emit(); | ||
let predicates = tcx.inferred_outlives_of(id.owner_id); | ||
let mut pred: Vec<String> = predicates | ||
.iter() | ||
.map(|(out_pred, _)| match out_pred.kind().skip_binder() { | ||
ty::ClauseKind::RegionOutlives(p) => p.to_string(), | ||
ty::ClauseKind::TypeOutlives(p) => p.to_string(), | ||
err => bug!("unexpected clause {:?}", err), | ||
}) | ||
.collect(); | ||
pred.sort(); | ||
|
||
let span = tcx.def_span(id.owner_id); | ||
let mut err = tcx.sess.struct_span_err(span, "rustc_outlives"); | ||
for p in pred { | ||
err.note(p); | ||
} | ||
err.emit(); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters