Merge pull request rust-lang#82 from topecongiro/fix-nightly

Fix build in nightly
eddyb · Jan 2, 2019 · eefc1ba · eefc1ba
2 parents b3f8a7d + f8fab65
commit eefc1ba
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/semcheck/mismatch.rs b/src/semcheck/mismatch.rs
@@ -8,7 +8,7 @@ use rustc::{
  hir::def_id::DefId,
  ty::{
  self,
- relate::{Relate, RelateResult, TypeRelation},
+ relate::{Relate, RelateResult, TraitObjectMode, TypeRelation},
  subst::Substs,
  Ty, TyCtxt,
  Visibility::Public,
@@ -94,6 +94,10 @@ impl<'a, 'gcx, 'tcx> TypeRelation<'a, 'gcx, 'tcx> for MismatchRelation<'a, 'gcx,
  "Mismatch"
  }
 
+ fn trait_object_mode(&self) -> TraitObjectMode {
+ TraitObjectMode::NoSquash
+ }
+
  fn a_is_expected(&self) -> bool {
  true
  }