Auto merge of #5158 - lzutao:callbackshook, r=flip1995

bors · bors · commit 0346873cc86e · 2020-02-11T19:39:57.000Z
Impl DefaultCallbacks on our side cc rust-lang/rust#69059 (comment) changelog: none
diff --git a/src/driver.rs b/src/driver.rs
@@ -63,10 +63,10 @@ fn test_arg_value() {
     assert_eq!(arg_value(args, "--foo", |_| true), None);
 }
 
-#[allow(clippy::too_many_lines)]
+struct DefaultCallbacks;
+impl rustc_driver::Callbacks for DefaultCallbacks {}
 
 struct ClippyCallbacks;
-
 impl rustc_driver::Callbacks for ClippyCallbacks {
     fn config(&mut self, config: &mut interface::Config) {
         let previous = config.register_lints.take();
@@ -387,7 +387,7 @@ pub fn main() {
                 }
             }
             let mut clippy = ClippyCallbacks;
-            let mut default = rustc_driver::DefaultCallbacks;
+            let mut default = DefaultCallbacks;
             let callbacks: &mut (dyn rustc_driver::Callbacks + Send) =
                 if clippy_enabled { &mut clippy } else { &mut default };
             rustc_driver::run_compiler(&args, callbacks, None, None)

Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,10 @@ fn test_arg_value() {`
`63`	`63`	`assert_eq!(arg_value(args, "--foo", \|_\| true), None);`
`64`	`64`	`}`
`65`	`65`
`66`		`-#[allow(clippy::too_many_lines)]`
	`66`	`+struct DefaultCallbacks;`
	`67`	`+impl rustc_driver::Callbacks for DefaultCallbacks {}`
`67`	`68`
`68`	`69`	`struct ClippyCallbacks;`
`69`		`-`
`70`	`70`	`impl rustc_driver::Callbacks for ClippyCallbacks {`
`71`	`71`	`fn config(&mut self, config: &mut interface::Config) {`
`72`	`72`	`let previous = config.register_lints.take();`
`@@ -387,7 +387,7 @@ pub fn main() {`
`387`	`387`	`}`
`388`	`388`	`}`
`389`	`389`	`let mut clippy = ClippyCallbacks;`
`390`		`- let mut default = rustc_driver::DefaultCallbacks;`
	`390`	`+ let mut default = DefaultCallbacks;`
`391`	`391`	`let callbacks: &mut (dyn rustc_driver::Callbacks + Send) =`
`392`	`392`	`if clippy_enabled { &mut clippy } else { &mut default };`
`393`	`393`	`rustc_driver::run_compiler(&args, callbacks, None, None)`