bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

no overlap errors after failing the orphan check

Browse source
This commit is contained in:
lcnr 2021-10-21 15:36:35 +02:00
parent 800a156c1e
commit 1296719c06
28 changed files with 506 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_trait_selection/src/traits/specialize/mod.rs
View file

@ -443,8 +443,12 @@ fn report_conflicting_impls(
match used_to_be_allowed {
None => {
sg.has_errored = true;
let err = struct_span_err!(tcx.sess, impl_span, E0119, "");
decorate(LintDiagnosticBuilder::new(err));
if overlap.with_impl.is_local() || !tcx.orphan_check_crate(()).contains(&impl_def_id) {
let err = struct_span_err!(tcx.sess, impl_span, E0119, "");
decorate(LintDiagnosticBuilder::new(err));
} else {
tcx.sess.delay_span_bug(impl_span, "impl should have failed the orphan check");
}
}
Some(kind) => {
let lint = match kind {