bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Address lcnr review

Browse source
This commit is contained in:
Ethan Brierley 2021-10-19 22:18:13 +01:00
parent b7d99983f8
commit 99b8c016ce
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
View file

@ -219,10 +219,12 @@ impl<'tcx> AbstractConst<'tcx> {
#[inline]
pub fn root(self, tcx: TyCtxt<'tcx>) -> Node<'tcx> {
let node = self.inner.last().copied().unwrap();
if let Node::Leaf(leaf) = node {
return Node::Leaf(leaf.subst(tcx, self.substs));
match node {
Node::Leaf(leaf) => Node::Leaf(leaf.subst(tcx, self.substs)),
Node::Cast(kind, operand, ty) => Node::Cast(kind, operand, ty.subst(tcx, self.substs)),
// Don't perform substitution on the following as they can't directly contain generic params
Node::Binop(_, _, _) | Node::UnaryOp(_, _) | Node::FunctionCall(_, _) => node,
}
node
}
}