Update formatting

This commit is contained in:
Michael Wright 2019-08-01 07:09:57 +02:00
parent fd9c5a3c71
commit be646ac0df
10 changed files with 17 additions and 19 deletions

View File

@ -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,

View File

@ -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);

View File

@ -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);
},
}
}

View File

@ -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 {

View File

@ -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 {

View File

@ -154,5 +154,4 @@ mod test {
"VersionInfo { crate_name: \"rustc_tools_util\", major: 0, minor: 2, patch: 0 }"
);
}
}

View File

@ -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).
}
}

View File

@ -78,7 +78,6 @@ fn test_owl_result() -> Result<(), ()> {
Ok(())
}
#[allow(dead_code)]
fn test_owl_result_2() -> Result<u8, ()> {
produce_half_owl_error().map_err(|_| ())?;

View File

@ -266,7 +266,7 @@ mod nesting {
enum Enum {
A,
B(u64),
C { field: bool }
C { field: bool },
}
impl Enum {
fn method() {

View File

@ -266,7 +266,7 @@ mod nesting {
enum Enum {
A,
B(u64),
C { field: bool }
C { field: bool },
}
impl Enum {
fn method() {