Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit c8d2849

Browse files
committed
Fixed build with newest nightly.
1 parent 91a1d91 commit c8d2849

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/mapping.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,13 +323,13 @@ impl NameMapping {
323323
Enum |
324324
Variant |
325325
Trait |
326-
Existential |
327326
TyAlias |
328327
ForeignTy |
329328
TraitAlias | // TODO: will need some handling later on
330329
AssocTy |
331-
AssocExistential |
332-
TyParam => Some(&mut self.type_map),
330+
TyParam |
331+
OpaqueTy |
332+
AssocOpaqueTy => Some(&mut self.type_map),
333333
Fn |
334334
Const |
335335
ConstParam |

src/mismatch.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use rustc::{
1212
self,
1313
relate::{Relate, RelateResult, TypeRelation},
1414
subst::SubstsRef,
15+
ParamEnv,
1516
Ty, TyCtxt,
1617
Visibility::Public,
1718
},
@@ -105,6 +106,10 @@ impl<'a, 'tcx> TypeRelation<'tcx> for MismatchRelation<'a, 'tcx> {
105106
self.tcx
106107
}
107108

109+
fn param_env(&self) -> ParamEnv<'tcx> {
110+
ParamEnv::empty()
111+
}
112+
108113
fn tag(&self) -> &'static str {
109114
"Mismatch"
110115
}

src/traverse.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,7 @@ fn diff_structure<'tcx>(
239239
| (Macro(_), Macro(_))
240240
| (TraitAlias, TraitAlias)
241241
| (ForeignTy, ForeignTy)
242-
| (ConstParam, ConstParam)
243-
| (AssocExistential, AssocExistential)
244-
| (Existential, Existential) => {}
242+
| (ConstParam, ConstParam) => {}
245243
// statics are subject to mutability comparison
246244
(Static, Static) => {
247245
let old_mut = tcx.is_mutable_static(o_def_id);

0 commit comments

Comments
 (0)