Skip to content

Commit

Permalink
quick fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
aliemjay committed Nov 23, 2022
1 parent 8e40dde commit 3ba10e2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 0 additions & 1 deletion compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
hir_id: hir::HirId,
) -> (Ty<'tcx>, Res) {
let tcx = self.tcx;
assert_eq!(res.ns(), Some(rustc_hir::def::Namespace::ValueNS));

let path_segs = match res {
Res::Local(_) | Res::SelfCtor(_) => vec![],
Expand Down
5 changes: 4 additions & 1 deletion compiler/rustc_traits/src/chalk/lowering.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,10 @@ impl<'tcx> LowerInto<'tcx, chalk_ir::GoalData<RustInterner<'tcx>>> for ty::Predi
GenericArgKind::Const(..) => {
chalk_ir::GoalData::All(chalk_ir::Goals::empty(interner))
}
GenericArgKind::Lifetime(lt) => bug!("unexpected well formed predicate: {:?}", lt),
// Lifetimes are unconditionally well-formed.
GenericArgKind::Lifetime(_) => {
chalk_ir::GoalData::All(chalk_ir::Goals::empty(interner))
}
},

ty::PredicateKind::ObjectSafe(t) => chalk_ir::GoalData::DomainGoal(
Expand Down

0 comments on commit 3ba10e2

Please sign in to comment.