bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

tidy

Browse source
This commit is contained in:
Ellen 2021-09-06 23:18:25 +01:00
parent 47b16f4ac9
commit c170dcf04c
3 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_privacy/src/lib.rs
View file

@ -159,9 +159,9 @@ where
self.visit_const(leaf) self.visit_const(leaf)
} }
ACNode::Cast(_, ty) => self.visit_ty(ty), ACNode::Cast(_, ty) => self.visit_ty(ty),
ACNode::Binop(..) ACNode::Binop(..) | ACNode::UnaryOp(..) | ACNode::FunctionCall(_, _) => {
| ACNode::UnaryOp(..) ControlFlow::CONTINUE
| ACNode::FunctionCall(_, _) => ControlFlow::CONTINUE, }
}) })
} }

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

@ -102,9 +102,9 @@ pub fn is_const_evaluatable<'cx, 'tcx>(
ControlFlow::CONTINUE ControlFlow::CONTINUE
} }
Node::Binop(_, _, _) Node::Binop(_, _, _) | Node::UnaryOp(_, _) | Node::FunctionCall(_, _) => {
| Node::UnaryOp(_, _) ControlFlow::CONTINUE
| Node::FunctionCall(_, _) => ControlFlow::CONTINUE, }
}); });
match failure_kind { match failure_kind {
@ -592,9 +592,7 @@ pub(super) fn try_unify<'tcx>(
&& iter::zip(a_args, b_args) && iter::zip(a_args, b_args)
.all(|(&an, &bn)| try_unify(tcx, a.subtree(an), b.subtree(bn))) .all(|(&an, &bn)| try_unify(tcx, a.subtree(an), b.subtree(bn)))
} }
(Node::Cast(a_operand, a_ty), Node::Cast(b_operand, b_ty)) (Node::Cast(a_operand, a_ty), Node::Cast(b_operand, b_ty)) if (a_ty == b_ty) => {
if (a_ty == b_ty) =>
{
try_unify(tcx, a.subtree(a_operand), b.subtree(b_operand)) try_unify(tcx, a.subtree(a_operand), b.subtree(b_operand))
} }
// use this over `_ => false` to make adding variants to `Node` less error prone // use this over `_ => false` to make adding variants to `Node` less error prone

6
compiler/rustc_trait_selection/src/traits/object_safety.rs
View file

@ -844,9 +844,9 @@ fn contains_illegal_self_type_reference<'tcx, T: TypeFoldable<'tcx>>(
self.visit_const(leaf) self.visit_const(leaf)
} }
Node::Cast(_, ty) => self.visit_ty(ty), Node::Cast(_, ty) => self.visit_ty(ty),
Node::Binop(..) Node::Binop(..) | Node::UnaryOp(..) | Node::FunctionCall(_, _) => {
| Node::UnaryOp(..) ControlFlow::CONTINUE
| Node::FunctionCall(_, _) => ControlFlow::CONTINUE, }
}) })
} else { } else {
ControlFlow::CONTINUE ControlFlow::CONTINUE