diff options
| author | bors <bors@rust-lang.org> | 2014-06-14 10:36:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-14 10:36:46 +0000 |
| commit | d64f18c490981f33f33e9c24e1ed1316e63f11fc (patch) | |
| tree | 71afdad0d3676e3c56b94bf39e866dd00d4c3f37 /src/librustc | |
| parent | dbd29ea96ef77a67496bb44de382140354c23632 (diff) | |
| parent | 09eb95f24165b2a7eec6a599b0a4bad86ff6892d (diff) | |
| download | rust-d64f18c490981f33f33e9c24e1ed1316e63f11fc.tar.gz rust-d64f18c490981f33f33e9c24e1ed1316e63f11fc.zip | |
auto merge of #14884 : huonw/rust/getoptsfail, r=alexcrichton
Diffstat (limited to 'src/librustc')
| -rw-r--r-- | src/librustc/driver/config.rs | 5 | ||||
| -rw-r--r-- | src/librustc/driver/mod.rs | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/librustc/driver/config.rs b/src/librustc/driver/config.rs index 3326b4e8304..b8838890bcf 100644 --- a/src/librustc/driver/config.rs +++ b/src/librustc/driver/config.rs @@ -792,7 +792,7 @@ mod test { let matches = &match getopts(["--test".to_string()], optgroups().as_slice()) { Ok(m) => m, - Err(f) => fail!("test_switch_implies_cfg_test: {}", f.to_err_msg()) + Err(f) => fail!("test_switch_implies_cfg_test: {}", f) }; let sessopts = build_session_options(matches); let sess = build_session(sessopts, None); @@ -809,8 +809,7 @@ mod test { optgroups().as_slice()) { Ok(m) => m, Err(f) => { - fail!("test_switch_implies_cfg_test_unless_cfg_test: {}", - f.to_err_msg()); + fail!("test_switch_implies_cfg_test_unless_cfg_test: {}", f) } }; let sessopts = build_session_options(matches); diff --git a/src/librustc/driver/mod.rs b/src/librustc/driver/mod.rs index b6205d8d54e..ff7f59559ca 100644 --- a/src/librustc/driver/mod.rs +++ b/src/librustc/driver/mod.rs @@ -205,7 +205,7 @@ pub fn handle_options(mut args: Vec<String>) -> Option<getopts::Matches> { match getopts::getopts(args.as_slice(), config::optgroups().as_slice()) { Ok(m) => m, Err(f) => { - early_error(f.to_err_msg().as_slice()); + early_error(f.to_str().as_slice()); } }; |