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

Use struct_fatal in new_parser_from_file.

Browse source 
It's a little more concise, and the standard way to do it.
This commit is contained in:
Nicholas Nethercote 2024-01-11 16:24:31 +11:00
parent f5c0cd0bd1
commit d5aafb846b
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_parse/src/lib.rs
View file

@ -19,7 +19,7 @@ use rustc_ast::tokenstream::TokenStream;
use rustc_ast::{AttrItem, Attribute, MetaItem}; use rustc_ast::{AttrItem, Attribute, MetaItem};
use rustc_ast_pretty::pprust; use rustc_ast_pretty::pprust;
use rustc_data_structures::sync::Lrc; use rustc_data_structures::sync::Lrc;
use rustc_errors::{Diagnostic, FatalError, Level, PResult}; use rustc_errors::{Diagnostic, PResult};
use rustc_session::parse::ParseSess; use rustc_session::parse::ParseSess;
use rustc_span::{FileName, SourceFile, Span}; use rustc_span::{FileName, SourceFile, Span};
@ -118,12 +118,11 @@ pub fn maybe_new_parser_from_source_str(
pub fn new_parser_from_file<'a>(sess: &'a ParseSess, path: &Path, sp: Option<Span>) -> Parser<'a> { pub fn new_parser_from_file<'a>(sess: &'a ParseSess, path: &Path, sp: Option<Span>) -> Parser<'a> {
let source_file = sess.source_map().load_file(path).unwrap_or_else(|e| { let source_file = sess.source_map().load_file(path).unwrap_or_else(|e| {
let msg = format!("couldn't read {}: {}", path.display(), e); let msg = format!("couldn't read {}: {}", path.display(), e);
let mut diag = Diagnostic::new(Level::Fatal, msg); let mut err = sess.dcx.struct_fatal(msg);
if let Some(sp) = sp { if let Some(sp) = sp {
diag.span(sp); err.span(sp);
} }
sess.dcx.emit_diagnostic(diag); err.emit();
FatalError.raise();
}); });
panictry_buffer!(&sess.dcx, maybe_source_file_to_parser(sess, source_file)) panictry_buffer!(&sess.dcx, maybe_source_file_to_parser(sess, source_file))