Skip to content

Commit ea7321c

Browse files
committed
1 parent 52314c8 commit ea7321c

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# NOTE: Keep in sync with nightly date on README
22
[toolchain]
3-
channel = "nightly-2022-02-15"
3+
channel = "nightly-2022-02-16"
44
components = ["llvm-tools-preview", "rustc-dev"]

src/mismatch.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl<'a, 'tcx> TypeRelation<'tcx> for MismatchRelation<'a, 'tcx> {
140140
// could potentially short-circuit somewhere).
141141
let dummy_type = self.tcx.types.unit;
142142

143-
if self.current_old_types.contains(a) || self.current_new_types.contains(b) {
143+
if self.current_old_types.contains(&a) || self.current_new_types.contains(&b) {
144144
return Ok(dummy_type);
145145
}
146146

@@ -270,8 +270,8 @@ impl<'a, 'tcx> TypeRelation<'tcx> for MismatchRelation<'a, 'tcx> {
270270
_ => None,
271271
};
272272

273-
self.current_old_types.remove(a);
274-
self.current_new_types.remove(b);
273+
self.current_old_types.remove(&a);
274+
self.current_new_types.remove(&b);
275275

276276
if let Some((old, new)) = matching {
277277
let old_def_id = old.def_id();
@@ -298,9 +298,9 @@ impl<'a, 'tcx> TypeRelation<'tcx> for MismatchRelation<'a, 'tcx> {
298298

299299
fn consts(
300300
&mut self,
301-
a: &'tcx ty::Const<'tcx>,
302-
_: &'tcx ty::Const<'tcx>,
303-
) -> RelateResult<'tcx, &'tcx ty::Const<'tcx>> {
301+
a: ty::Const<'tcx>,
302+
_: ty::Const<'tcx>,
303+
) -> RelateResult<'tcx, ty::Const<'tcx>> {
304304
Ok(a) // TODO
305305
}
306306

src/traverse.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ fn is_impl_trait_public<'tcx>(tcx: TyCtxt<'tcx>, impl_def_id: DefId) -> bool {
11101110
TyKind::Array(t, _)
11111111
| TyKind::Slice(t)
11121112
| TyKind::RawPtr(TypeAndMut { ty: t, .. })
1113-
| TyKind::Ref(_, t, _) => type_visibility(tcx, t),
1113+
| TyKind::Ref(_, t, _) => type_visibility(tcx, *t),
11141114

11151115
TyKind::Bool
11161116
| TyKind::Char

0 commit comments

Comments
 (0)