From: Philipp Hansch Date: Sun, 3 Mar 2019 12:00:49 +0000 (+0100) Subject: fmt fixes X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=68096cf181a792d89699369427f505100df188c1;p=rust.git fmt fixes --- diff --git a/clippy_lints/src/escape.rs b/clippy_lints/src/escape.rs index 6060d3e7b28..45ecdc3d310 100644 --- a/clippy_lints/src/escape.rs +++ b/clippy_lints/src/escape.rs @@ -112,9 +112,7 @@ fn consume_pat(&mut self, consume_pat: &Pat, cmt: &cmt_<'tcx>, _: ConsumeMode) { let map = &self.cx.tcx.hir(); if map.is_argument(map.hir_to_node_id(consume_pat.hir_id)) { // Skip closure arguments - if let Some(Node::Expr(..)) = map.find_by_hir_id( - map.get_parent_node_by_hir_id(consume_pat.hir_id)) - { + if let Some(Node::Expr(..)) = map.find_by_hir_id(map.get_parent_node_by_hir_id(consume_pat.hir_id)) { return; } if is_non_trait_box(cmt.ty) && !self.is_large_box(cmt.ty) { diff --git a/clippy_lints/src/len_zero.rs b/clippy_lints/src/len_zero.rs index d66fcee97ec..094cfcf1b1f 100644 --- a/clippy_lints/src/len_zero.rs +++ b/clippy_lints/src/len_zero.rs @@ -194,7 +194,10 @@ fn is_named_self(cx: &LateContext<'_, '_>, item: &ImplItemRef, name: &str) -> bo } let is_empty = if let Some(is_empty) = impl_items.iter().find(|i| is_named_self(cx, i, "is_empty")) { - if cx.access_levels.is_exported(cx.tcx.hir().hir_to_node_id(is_empty.id.hir_id)) { + if cx + .access_levels + .is_exported(cx.tcx.hir().hir_to_node_id(is_empty.id.hir_id)) + { return; } else { "a private" diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs index c8f557d3341..811e7fc6c63 100644 --- a/clippy_lints/src/loops.rs +++ b/clippy_lints/src/loops.rs @@ -2051,9 +2051,9 @@ enum VarState { /// Scan a for loop for variables that are incremented exactly once. struct IncrementVisitor<'a, 'tcx: 'a> { - cx: &'a LateContext<'a, 'tcx>, // context reference - states: FxHashMap, // incremented variables - depth: u32, // depth of conditional expressions + cx: &'a LateContext<'a, 'tcx>, // context reference + states: FxHashMap, // incremented variables + depth: u32, // depth of conditional expressions done: bool, }