Macro guard implementation and lint suggestion refector

Author: benacq

clippy_lints/src/lib.rs

@@ -943,10 +943,6 @@ pub fn register_lints(store: &mut rustc_lint::LintStore, conf: &'static Conf) {
     store.register_late_pass(move |_| Box::new(non_std_lazy_statics::NonStdLazyStatic::new(conf)));
     store.register_late_pass(|_| Box::new(manual_option_as_slice::ManualOptionAsSlice::new(conf)));
     store.register_late_pass(|_| Box::new(single_option_map::SingleOptionMap));
-<<<<<<< HEAD
-    store.register_late_pass(move |_| Box::new(manual_checked_sub::ManualCheckedSub::new(conf)));
-=======
     store.register_late_pass(move |_| Box::new(redundant_test_prefix::RedundantTestPrefix));
->>>>>>> 34f81f96e9f43ba5c033f146eabbd5eb0d48638f
     // add lints here, do not remove this comment, it's used in `new_lint`
 }