Skip to content

Commit 4f5c51d

Browse files
committed
---
yaml --- r: 274713 b: refs/heads/stable c: 9951ac4 h: refs/heads/master i: 274711: 1666a47
1 parent 17369af commit 4f5c51d

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 601e04534f4f8117f4d121bdd9bfb5ed100c72e6
32+
refs/heads/stable: 9951ac4be90848bbc12e8187886047ae35795c8d
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/librustc_driver/lib.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,11 @@ pub fn run_compiler<'a>(args: &[String],
164164

165165
let descriptions = diagnostics_registry();
166166

167-
do_or_return!(callbacks.early_callback(&matches, &descriptions, sopts.error_format), None);
167+
do_or_return!(callbacks.early_callback(&matches,
168+
&sopts,
169+
&descriptions,
170+
sopts.error_format),
171+
None);
168172

169173
let (odir, ofile) = make_output(&matches);
170174
let (input, input_file_path) = match make_input(&matches.free) {
@@ -251,6 +255,7 @@ pub trait CompilerCalls<'a> {
251255
// else (e.g., selecting input and output).
252256
fn early_callback(&mut self,
253257
_: &getopts::Matches,
258+
_: &config::Options,
254259
_: &diagnostics::registry::Registry,
255260
_: ErrorOutputType)
256261
-> Compilation {
@@ -327,6 +332,7 @@ pub struct RustcDefaultCalls;
327332
impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
328333
fn early_callback(&mut self,
329334
matches: &getopts::Matches,
335+
_sopts: &config::Options,
330336
descriptions: &diagnostics::registry::Registry,
331337
output: ErrorOutputType)
332338
-> Compilation {

branches/stable/src/test/run-pass-fulldeps/compiler-calls.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ struct TestCalls {
3434
impl<'a> CompilerCalls<'a> for TestCalls {
3535
fn early_callback(&mut self,
3636
_: &getopts::Matches,
37+
_: &config::Options,
3738
_: &diagnostics::registry::Registry,
3839
_: config::ErrorOutputType)
3940
-> Compilation {

0 commit comments

Comments
 (0)