From be646ac0dff10f154855b9dc706294c2a4ee9059 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Thu, 1 Aug 2019 07:09:57 +0200 Subject: [PATCH] Update formatting --- clippy_lints/src/consts.rs | 4 +--- clippy_lints/src/misc_early.rs | 2 +- clippy_lints/src/open_options.rs | 8 ++++---- clippy_lints/src/redundant_static_lifetimes.rs | 3 ++- clippy_lints/src/use_self.rs | 7 +++---- rustc_tools_util/src/lib.rs | 1 - tests/ui/checked_unwrap/simple_conditionals.rs | 6 ++++-- tests/ui/drop_forget_ref.rs | 1 - tests/ui/use_self.fixed | 2 +- tests/ui/use_self.rs | 2 +- 10 files changed, 17 insertions(+), 19 deletions(-) diff --git a/clippy_lints/src/consts.rs b/clippy_lints/src/consts.rs index d18474abdcd..9d1cc110e5d 100644 --- a/clippy_lints/src/consts.rs +++ b/clippy_lints/src/consts.rs @@ -65,9 +65,7 @@ impl PartialEq for Constant { f64::from(l).to_bits() == f64::from(r).to_bits() }, (&Self::Bool(l), &Self::Bool(r)) => l == r, - (&Self::Vec(ref l), &Self::Vec(ref r)) | (&Self::Tuple(ref l), &Self::Tuple(ref r)) => { - l == r - }, + (&Self::Vec(ref l), &Self::Vec(ref r)) | (&Self::Tuple(ref l), &Self::Tuple(ref r)) => l == r, (&Self::Repeat(ref lv, ref ls), &Self::Repeat(ref rv, ref rs)) => ls == rs && lv == rv, // TODO: are there inter-type equalities? _ => false, diff --git a/clippy_lints/src/misc_early.rs b/clippy_lints/src/misc_early.rs index c2e42a0a993..c9df436dae7 100644 --- a/clippy_lints/src/misc_early.rs +++ b/clippy_lints/src/misc_early.rs @@ -305,7 +305,7 @@ impl EarlyLintPass for MiscEarlyLints { name makes code comprehension and documentation more difficult", arg_name[1..].to_owned() ), - );; + ); } } else { registered_names.insert(arg_name, arg.pat.span); diff --git a/clippy_lints/src/open_options.rs b/clippy_lints/src/open_options.rs index e115769abe8..5a3af2c3773 100644 --- a/clippy_lints/src/open_options.rs +++ b/clippy_lints/src/open_options.rs @@ -127,7 +127,7 @@ fn check_open_options(cx: &LateContext<'_, '_>, options: &[(OpenOption, Argument } else { create = true } - create_arg = create_arg || (arg == Argument::True);; + create_arg = create_arg || (arg == Argument::True); }, (OpenOption::Append, arg) => { if append { @@ -140,7 +140,7 @@ fn check_open_options(cx: &LateContext<'_, '_>, options: &[(OpenOption, Argument } else { append = true } - append_arg = append_arg || (arg == Argument::True);; + append_arg = append_arg || (arg == Argument::True); }, (OpenOption::Truncate, arg) => { if truncate { @@ -166,7 +166,7 @@ fn check_open_options(cx: &LateContext<'_, '_>, options: &[(OpenOption, Argument } else { read = true } - read_arg = read_arg || (arg == Argument::True);; + read_arg = read_arg || (arg == Argument::True); }, (OpenOption::Write, arg) => { if write { @@ -179,7 +179,7 @@ fn check_open_options(cx: &LateContext<'_, '_>, options: &[(OpenOption, Argument } else { write = true } - write_arg = write_arg || (arg == Argument::True);; + write_arg = write_arg || (arg == Argument::True); }, } } diff --git a/clippy_lints/src/redundant_static_lifetimes.rs b/clippy_lints/src/redundant_static_lifetimes.rs index bdd48fe8646..4d9fbbca83e 100644 --- a/clippy_lints/src/redundant_static_lifetimes.rs +++ b/clippy_lints/src/redundant_static_lifetimes.rs @@ -81,7 +81,8 @@ impl EarlyLintPass for RedundantStaticLifetimes { if !in_macro_or_desugar(item.span) { if let ItemKind::Const(ref var_type, _) = item.node { self.visit_type(var_type, cx, "Constants have by default a `'static` lifetime"); - // Don't check associated consts because `'static` cannot be elided on those (issue #2438) + // Don't check associated consts because `'static` cannot be elided on those (issue + // #2438) } if let ItemKind::Static(ref var_type, _, _) = item.node { diff --git a/clippy_lints/src/use_self.rs b/clippy_lints/src/use_self.rs index 3f93e019c66..4e2e97ddf95 100644 --- a/clippy_lints/src/use_self.rs +++ b/clippy_lints/src/use_self.rs @@ -222,13 +222,12 @@ impl<'a, 'tcx> Visitor<'tcx> for UseSelfVisitor<'a, 'tcx> { let last_but_one = &path.segments[path.segments.len() - 2]; if last_but_one.ident.name != kw::SelfUpper { let enum_def_id = match path.res { - Res::Def(DefKind::Variant, variant_def_id) => - self.cx.tcx.parent(variant_def_id), + Res::Def(DefKind::Variant, variant_def_id) => self.cx.tcx.parent(variant_def_id), Res::Def(DefKind::Ctor(def::CtorOf::Variant, _), ctor_def_id) => { let variant_def_id = self.cx.tcx.parent(ctor_def_id); variant_def_id.and_then(|def_id| self.cx.tcx.parent(def_id)) - } - _ => None + }, + _ => None, }; if self.item_path.res.opt_def_id() == enum_def_id { diff --git a/rustc_tools_util/src/lib.rs b/rustc_tools_util/src/lib.rs index ec3b69219e7..92b710614ec 100644 --- a/rustc_tools_util/src/lib.rs +++ b/rustc_tools_util/src/lib.rs @@ -154,5 +154,4 @@ mod test { "VersionInfo { crate_name: \"rustc_tools_util\", major: 0, minor: 2, patch: 0 }" ); } - } diff --git a/tests/ui/checked_unwrap/simple_conditionals.rs b/tests/ui/checked_unwrap/simple_conditionals.rs index c20c4a7a700..c080ae82697 100644 --- a/tests/ui/checked_unwrap/simple_conditionals.rs +++ b/tests/ui/checked_unwrap/simple_conditionals.rs @@ -31,10 +31,12 @@ fn main() { if x.is_ok() { x = Err(()); x.unwrap(); // not unnecessary because of mutation of x - // it will always panic but the lint is not smart enough to see this (it only checks if conditions). + // it will always panic but the lint is not smart enough to see this (it only + // checks if conditions). } else { x = Ok(()); x.unwrap_err(); // not unnecessary because of mutation of x - // it will always panic but the lint is not smart enough to see this (it only checks if conditions). + // it will always panic but the lint is not smart enough to see this (it + // only checks if conditions). } } diff --git a/tests/ui/drop_forget_ref.rs b/tests/ui/drop_forget_ref.rs index b60f373e75e..aad996c0376 100644 --- a/tests/ui/drop_forget_ref.rs +++ b/tests/ui/drop_forget_ref.rs @@ -78,7 +78,6 @@ fn test_owl_result() -> Result<(), ()> { Ok(()) } - #[allow(dead_code)] fn test_owl_result_2() -> Result { produce_half_owl_error().map_err(|_| ())?; diff --git a/tests/ui/use_self.fixed b/tests/ui/use_self.fixed index ac2a1708b65..86ed7ca26f9 100644 --- a/tests/ui/use_self.fixed +++ b/tests/ui/use_self.fixed @@ -266,7 +266,7 @@ mod nesting { enum Enum { A, B(u64), - C { field: bool } + C { field: bool }, } impl Enum { fn method() { diff --git a/tests/ui/use_self.rs b/tests/ui/use_self.rs index 21b5833e56e..cabb9a7f82a 100644 --- a/tests/ui/use_self.rs +++ b/tests/ui/use_self.rs @@ -266,7 +266,7 @@ mod nesting { enum Enum { A, B(u64), - C { field: bool } + C { field: bool }, } impl Enum { fn method() {