OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix position of mut in toplevel-ref-arg (fixes #1100, again)

Browse Source
This commit is contained in:
Manish Goregaokar 2016-07-15 19:02:41 +05:30
parent 6a20d6a5f6
commit b8c5e5a89c
No known key found for this signature in database
GPG Key ID: 3BBF4D3E2EF79F98
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clippy_lints/src/misc.rs
View File

@ -62,29 +62,28 @@ impl LateLintPass for TopLevelRefPass {
let PatKind::Binding(BindByRef(mt), i, None) = l.pat.node,
let Some(ref init) = l.init
], {
let init = Sugg::hir(cx, init, "..");
let (mutopt,initref) = if mt == Mutability::MutMutable {
("mut ", init.mut_addr())
} else {
("", init.addr())
};
let tyopt = if let Some(ref ty) = l.ty {
format!(": &{}", snippet(cx, ty.span, "_"))
format!(": &{mutopt}{ty}", mutopt=mutopt, ty=snippet(cx, ty.span, "_"))
} else {
"".to_owned()
};
let mutopt = if mt == Mutability::MutMutable {
"mut "
} else {
""
};
span_lint_and_then(cx,
TOPLEVEL_REF_ARG,
l.pat.span,
"`ref` on an entire `let` pattern is discouraged, take a reference with `&` instead",
|db| {
let init = Sugg::hir(cx, init, "..");
db.span_suggestion(s.span,
"try",
format!("let {}{}{} = {};",
mutopt,
snippet(cx, i.span, "_"),
tyopt,
init.addr()));
format!("let {name}{tyopt} = {initref};",
name=snippet(cx, i.span, "_"),
tyopt=tyopt,
initref=initref));
}
);
}}

2
tests/compile-fail/toplevel_ref_arg.rs
View File

@ -33,7 +33,7 @@ fn main() {
let ref mut z = 1 + 2;
//~^ ERROR `ref` on an entire `let` pattern is discouraged
//~| HELP try
//~| SUGGESTION let mut z = &(1 + 2);
//~| SUGGESTION let z = &mut (1 + 2);
let (ref x, _) = (1,2); // okay, not top level
println!("The answer is {}.", x);