about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-07-16 14:15:34 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-07-16 16:37:40 +0530
commit2a74fa35828f8daa6df00c4414241493dd57555a (patch)
treea3eb37933a328fccd0e75aca3b6ae1f17eabffde /src
parentc8ec909cdd35a82ee79ab18a15a696805e331b17 (diff)
parent441b1c6103c55eb78532f9e3695463bddd3b5913 (diff)
downloadrust-2a74fa35828f8daa6df00c4414241493dd57555a.tar.gz
rust-2a74fa35828f8daa6df00c4414241493dd57555a.zip
Rollup merge of #27046 - nrc:driver-defaults, r=alexcrichton
Diffstat (limited to 'src')
-rw-r--r--src/librustc_driver/lib.rs12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index 2906fd35a0a..a8856e42da4 100644
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -204,7 +204,9 @@ pub trait CompilerCalls<'a> {
     fn early_callback(&mut self,
                       &getopts::Matches,
                       &diagnostics::registry::Registry)
-                      -> Compilation;
+                      -> Compilation {
+        Compilation::Continue
+    }
 
     // Hook for a callback late in the process of handling arguments. This will
     // be called just before actual compilation starts (and before build_controller
@@ -215,7 +217,9 @@ pub trait CompilerCalls<'a> {
                      &Input,
                      &Option<PathBuf>,
                      &Option<PathBuf>)
-                     -> Compilation;
+                     -> Compilation {
+        Compilation::Continue
+    }
 
     // Called after we extract the input from the arguments. Gives the implementer
     // an opportunity to change the inputs or to add some custom input handling.
@@ -236,7 +240,9 @@ pub trait CompilerCalls<'a> {
                 &Option<PathBuf>,
                 &Option<PathBuf>,
                 &diagnostics::registry::Registry)
-                -> Option<(Input, Option<PathBuf>)>;
+                -> Option<(Input, Option<PathBuf>)> {
+        None
+    }
 
     // Parse pretty printing information from the arguments. The implementer can
     // choose to ignore this (the default will return None) which will skip pretty