Auto merge of #4561 - rust-lang:let-return-fix, r=phansch

Fix let_and_return lint

This fixes #4555 (false positive for the `let_and_return` lint).

changelog: none
This commit is contained in:
bors 2019-09-23 08:25:38 +00:00
commit 4d566b6959

View file

@ -208,6 +208,8 @@ impl Return {
if let ast::ExprKind::Path(_, ref path) = retexpr.node;
if match_path_ast(path, &[&*ident.name.as_str()]);
if !in_external_macro(cx.sess(), initexpr.span);
if !in_external_macro(cx.sess(), retexpr.span);
if !in_external_macro(cx.sess(), local.span);
then {
span_lint_and_then(
cx,