Skip to content

Commit 4efc86e

Browse files
committed
Auto merge of #31631 - jonas-schievink:agoraphobia, r=nrc
[breaking-batch] Move more uses of `panictry!` out of libsyntax
2 parents 7d338fe + 228f8a0 commit 4efc86e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

core.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ pub fn run_core(search_paths: SearchPaths, cfgs: Vec<String>, externs: Externs,
133133
let mut cfg = config::build_configuration(&sess);
134134
target_features::add_configuration(&mut cfg, &sess);
135135

136-
let krate = driver::phase_1_parse_input(&sess, cfg, &input);
136+
let krate = panictry!(driver::phase_1_parse_input(&sess, cfg, &input));
137137

138138
let name = link::find_crate_name(Some(&sess), &krate.attrs,
139139
&input);

lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extern crate rustc_back;
4343
extern crate rustc_front;
4444
extern crate rustc_metadata;
4545
extern crate serialize;
46-
extern crate syntax;
46+
#[macro_use] extern crate syntax;
4747
extern crate test as testing;
4848
extern crate rustc_unicode;
4949
#[macro_use] extern crate log;

test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ pub fn run(input: &str,
9191

9292
let mut cfg = config::build_configuration(&sess);
9393
cfg.extend(config::parse_cfgspecs(cfgs.clone()));
94-
let krate = driver::phase_1_parse_input(&sess, cfg, &input);
94+
let krate = panictry!(driver::phase_1_parse_input(&sess, cfg, &input));
9595
let krate = driver::phase_2_configure_and_expand(&sess, &cstore, krate,
9696
"rustdoc-test", None)
9797
.expect("phase_2_configure_and_expand aborted in rustdoc!");

0 commit comments

Comments
 (0)