From 30de91d3e9e724c8ebc5d3df342aa4e66a88dd47 Mon Sep 17 00:00:00 2001
From: llogiq <bogusandre@gmail.com>
Date: Mon, 1 Jun 2015 22:30:34 +0200
Subject: [PATCH] moved in_macro to (new) utils.rs

---
 src/attrs.rs          |  2 +-
 src/collapsible_if.rs |  2 +-
 src/mut_mut.rs        | 11 +----------
 src/utils.rs          | 12 ++++++++++++
 4 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 src/utils.rs

diff --git a/src/attrs.rs b/src/attrs.rs
index f056ac6ee8c..5ee8745c33e 100644
--- a/src/attrs.rs
+++ b/src/attrs.rs
@@ -6,7 +6,7 @@
 use syntax::ptr::P;
 use syntax::codemap::{Span, ExpnInfo};
 use syntax::parse::token::InternedString;
-use mut_mut::in_macro;
+use utils::in_macro;
 
 declare_lint! { pub INLINE_ALWAYS, Warn,
     "#[inline(always)] is usually a bad idea."}
diff --git a/src/collapsible_if.rs b/src/collapsible_if.rs
index b9ebeed01de..85c1b25a673 100644
--- a/src/collapsible_if.rs
+++ b/src/collapsible_if.rs
@@ -19,7 +19,7 @@
 use syntax::ptr::P;
 use syntax::codemap::{Span, Spanned, ExpnInfo};
 use syntax::print::pprust::expr_to_string;
-use mut_mut::in_macro;
+use utils::in_macro;
 
 declare_lint! {
     pub COLLAPSIBLE_IF,
diff --git a/src/mut_mut.rs b/src/mut_mut.rs
index 3ba9c47e7fe..202b5600dbe 100644
--- a/src/mut_mut.rs
+++ b/src/mut_mut.rs
@@ -3,6 +3,7 @@
 use rustc::lint::{Context, LintPass, LintArray, Lint};
 use rustc::middle::ty::{expr_ty, sty, ty_ptr, ty_rptr, mt};
 use syntax::codemap::{BytePos, ExpnInfo, MacroFormat, Span};
+use utils::in_macro;
 
 declare_lint!(pub MUT_MUT, Warn,
               "Warn on usage of double-mut refs, e.g. '&mut &mut ...'");
@@ -51,16 +52,6 @@ fn unwrap_addr(expr : &Expr) -> Option<&Expr> {
 	})
 }
 
-pub fn in_macro(cx: &Context, opt_info: Option<&ExpnInfo>) -> bool {
-	opt_info.map_or(false, |info| {
-		info.callee.span.map_or(true, |span| {
-			cx.sess().codemap().span_to_snippet(span).ok().map_or(true, |code| 
-				!code.starts_with("macro_rules")
-			)
-		})
-	})
-}
-
 fn unwrap_mut(ty : &Ty) -> Option<&Ty> {
 	match ty.node {
 		TyPtr(MutTy{ ty: ref pty, mutbl: MutMutable }) => Option::Some(pty),
diff --git a/src/utils.rs b/src/utils.rs
new file mode 100644
index 00000000000..e6e0c0e4868
--- /dev/null
+++ b/src/utils.rs
@@ -0,0 +1,12 @@
+use rustc::lint::Context;
+use syntax::codemap::ExpnInfo;
+
+fn in_macro(cx: &Context, opt_info: Option<&ExpnInfo>) -> bool {
+	opt_info.map_or(false, |info| {
+		info.callee.span.map_or(true, |span| {
+			cx.sess().codemap().span_to_snippet(span).ok().map_or(true, |code| 
+				!code.starts_with("macro_rules")
+			)
+		})
+	})
+}
-- 
2.44.0