Skip to content

Commit

Permalink
Rollup merge of #125792 - compiler-errors:dont-drop-upcast-cand, r=lcnr
Browse files Browse the repository at this point in the history
Don't drop `Unsize` candidate in intercrate mode

Fixes #125767
  • Loading branch information
matthiaskrgr authored Jun 5, 2024
2 parents efc3fdc + e485b19 commit e174512
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,12 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
param_env: ty::ParamEnv<'tcx>,
cause: &ObligationCause<'tcx>,
) -> Option<ty::PolyExistentialTraitRef<'tcx>> {
// Don't drop any candidates in intercrate mode, as it's incomplete.
// (Not that it matters, since `Unsize` is not a stable trait.)
if self.infcx.intercrate {
return None;
}

let tcx = self.tcx();
if tcx.features().trait_upcasting {
return None;
Expand Down
13 changes: 13 additions & 0 deletions tests/ui/specialization/dont-drop-upcast-candidate.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#![feature(unsize)]

use std::marker::Unsize;
use std::ops::Deref;

trait Foo: Bar {}
trait Bar {}

impl<T> Bar for T where dyn Foo: Unsize<dyn Bar> {}
impl Bar for () {}
//~^ ERROR conflicting implementations of trait `Bar` for type `()`

fn main() {}
11 changes: 11 additions & 0 deletions tests/ui/specialization/dont-drop-upcast-candidate.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
error[E0119]: conflicting implementations of trait `Bar` for type `()`
--> $DIR/dont-drop-upcast-candidate.rs:10:1
|
LL | impl<T> Bar for T where dyn Foo: Unsize<dyn Bar> {}
| ------------------------------------------------ first implementation here
LL | impl Bar for () {}
| ^^^^^^^^^^^^^^^ conflicting implementation for `()`

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0119`.

0 comments on commit e174512

Please sign in to comment.