squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Changed macro_backtrace() to in_macro().

Browse source
This commit is contained in:
daxpedda 2018-12-25 12:48:54 +01:00
parent b5587a894f
commit a77bcadaa5
No known key found for this signature in database
GPG key ID: C722DCB6A191EEAB
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clippy_lints/src/implicit_return.rs
View file

@ -12,7 +12,7 @@ use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
use crate::rustc::{declare_tool_lint, lint_array}; use crate::rustc::{declare_tool_lint, lint_array};
use crate::rustc_errors::Applicability; use crate::rustc_errors::Applicability;
use crate::syntax::{ast::NodeId, source_map::Span}; use crate::syntax::{ast::NodeId, source_map::Span};
use crate::utils::{snippet_opt, span_lint_and_then}; use crate::utils::{snippet_opt, span_lint_and_then, in_macro};
/// **What it does:** Checks for missing return statements at the end of a block. /// **What it does:** Checks for missing return statements at the end of a block.
/// ///
@ -124,7 +124,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
// checking return type through MIR, HIR is not able to determine inferred closure return types // checking return type through MIR, HIR is not able to determine inferred closure return types
// make sure it's not a macro // make sure it's not a macro
if !mir.return_ty().is_unit() && span.macro_backtrace().is_empty() { if !mir.return_ty().is_unit() && !in_macro(span) {
Self::expr_match(cx, &body.value); Self::expr_match(cx, &body.value);
} }
} }

2
clippy_lints/src/loops.rs
View file

@ -479,7 +479,7 @@ impl LintPass for Pass {
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass { impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) { fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
// we don't want to check expanded macros // we don't want to check expanded macros
if !expr.span.macro_backtrace().is_empty() { if !in_macro(expr.span) {
return; return;
} }