bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Inline and remove parse_crate{,_attrs}_from_{file,source_str}.

Browse source 
All four functions are simple and have a single call site.

This requires making `Parser::parse_inner_attributes` public, which is
no big deal.
This commit is contained in:
Nicholas Nethercote 2024-05-31 13:56:44 +10:00
parent 8964106e44
commit 25972aec67
4 changed files with 16 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_driver_impl/src/lib.rs
View file

@ -32,6 +32,7 @@ use rustc_interface::{interface, Queries};
use rustc_lint::unerased_lint_store;
use rustc_metadata::creader::MetadataLoader;
use rustc_metadata::locator;
use rustc_parse::{new_parser_from_file, new_parser_from_source_str};
use rustc_session::config::{nightly_options, CG_OPTIONS, Z_OPTIONS};
use rustc_session::config::{ErrorOutputType, Input, OutFileName, OutputType};
use rustc_session::getopts::{self, Matches};
@ -1264,12 +1265,13 @@ pub fn handle_options(early_dcx: &EarlyDiagCtxt, args: &[String]) -> Option<geto
}
fn parse_crate_attrs<'a>(sess: &'a Session) -> PResult<'a, ast::AttrVec> {
match &sess.io.input {
Input::File(ifile) => rustc_parse::parse_crate_attrs_from_file(ifile, &sess.psess),
let mut parser = match &sess.io.input {
Input::File(file) => new_parser_from_file(&sess.psess, file, None),
Input::Str { name, input } => {
rustc_parse::parse_crate_attrs_from_source_str(name.clone(), input.clone(), &sess.psess)
new_parser_from_source_str(&sess.psess, name.clone(), input.clone())
}
}
};
parser.parse_inner_attributes()
}
/// Runs a closure and catches unwinds triggered by fatal errors.