mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make match exaustive

Browse Source
This commit is contained in:
Douglas Campos 2017-09-29 22:21:35 -04:00
parent 59e778e5e1
commit a29c770c68
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/librustc/ty/instance.rs
View File

@ -247,15 +247,17 @@ fn resolve_associated_item<'a, 'tcx>(
substs: rcvr_substs
})
}
traits::VtableBuiltin(..) if Some(trait_id) == tcx.lang_items().clone_trait() => {
Some(Instance {
def: ty::InstanceDef::CloneShim(def_id, trait_ref.self_ty()),
substs: rcvr_substs
})
}
_ => {
None
traits::VtableBuiltin(..) => {
if let Some(_) = tcx.lang_items().clone_trait() {
Some(Instance {
def: ty::InstanceDef::CloneShim(def_id, trait_ref.self_ty()),
substs: rcvr_substs
})
} else {
None
}
}
traits::VtableDefaultImpl(..) | traits::VtableParam(..) => None
}
}
@ -287,8 +289,9 @@ fn needs_fn_once_adapter_shim<'a, 'tcx>(actual_closure_kind: ty::ClosureKind,
//
// These are both the same at trans time.
Ok(true)
}
_ => Err(()),
}
(ty::ClosureKind::FnMut, _) |
(ty::ClosureKind::FnOnce, _) => Err(())
}
}