b9037339cb
Currently we have an awkward mix of fallible and infallible functions:
```
new_parser_from_source_str
maybe_new_parser_from_source_str
new_parser_from_file
(maybe_new_parser_from_file) // missing
(new_parser_from_source_file) // missing
maybe_new_parser_from_source_file
source_str_to_stream
maybe_source_file_to_stream
```
We could add the two missing functions, but instead this commit removes
of all the infallible ones and renames the fallible ones leaving us with
these which are all fallible:
```
new_parser_from_source_str
new_parser_from_file
new_parser_from_source_file
source_str_to_stream
source_file_to_stream
```
This requires making `unwrap_or_emit_fatal` public so callers of
formerly infallible functions can still work.
This does make some of the call sites slightly more verbose, but I think
it's worth it for the simpler API. Also, there are two `catch_unwind`
calls and one `catch_fatal_errors` call in this diff that become
removable thanks this change. (I will do that in a follow-up PR.)
40 lines
1.1 KiB
Rust
40 lines
1.1 KiB
Rust
//@ run-pass
|
|
// Testing that a librustc_ast can parse modules with canonicalized base path
|
|
//@ ignore-cross-compile
|
|
//@ ignore-remote
|
|
// no-remap-src-base: Reading `file!()` (expectedly) fails when enabled.
|
|
|
|
#![feature(rustc_private)]
|
|
|
|
extern crate rustc_ast;
|
|
extern crate rustc_parse;
|
|
extern crate rustc_session;
|
|
extern crate rustc_span;
|
|
|
|
// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
|
|
// files.
|
|
#[allow(unused_extern_crates)]
|
|
extern crate rustc_driver;
|
|
|
|
use rustc_parse::{new_parser_from_file, unwrap_or_emit_fatal};
|
|
use rustc_session::parse::ParseSess;
|
|
use std::path::Path;
|
|
|
|
#[path = "mod_dir_simple/test.rs"]
|
|
mod gravy;
|
|
|
|
pub fn main() {
|
|
rustc_span::create_default_session_globals_then(|| parse());
|
|
|
|
assert_eq!(gravy::foo(), 10);
|
|
}
|
|
|
|
fn parse() {
|
|
let psess = ParseSess::new(vec![rustc_parse::DEFAULT_LOCALE_RESOURCE]);
|
|
|
|
let path = Path::new(file!());
|
|
let path = path.canonicalize().unwrap();
|
|
let mut parser = unwrap_or_emit_fatal(new_parser_from_file(&psess, &path, None));
|
|
let _ = parser.parse_crate_mod();
|
|
}
|