Skip to content

Commit

Permalink
Rollup merge of rust-lang#65787 - Centril:panictry, r=davidtwco
Browse files Browse the repository at this point in the history
move panictry! to where it is used.

From rust-lang#65324

r? @davidtwco
  • Loading branch information
Centril authored Oct 25, 2019
2 parents 07b5c2a + d7f6ba8 commit 0bfe483
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
17 changes: 0 additions & 17 deletions src/libsyntax/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,6 @@ mod tests;

pub const MACRO_ARGUMENTS: Option<&'static str> = Some("macro arguments");

// A variant of 'panictry!' that works on a Vec<Diagnostic> instead of a single DiagnosticBuilder.
macro_rules! panictry_buffer {
($handler:expr, $e:expr) => ({
use std::result::Result::{Ok, Err};
use errors::FatalError;
match $e {
Ok(e) => e,
Err(errs) => {
for e in errs {
$handler.emit_diagnostic(&e);
}
FatalError.raise()
}
}
})
}

#[macro_export]
macro_rules! unwrap_or {
($opt:expr, $default:expr) => {
Expand Down
17 changes: 17 additions & 0 deletions src/libsyntax/parse/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,23 @@ pub enum DirectoryOwnership {
// uses a HOF to parse anything, and <source> includes file and
// `source_str`.

/// A variant of 'panictry!' that works on a Vec<Diagnostic> instead of a single DiagnosticBuilder.
macro_rules! panictry_buffer {
($handler:expr, $e:expr) => ({
use std::result::Result::{Ok, Err};
use errors::FatalError;
match $e {
Ok(e) => e,
Err(errs) => {
for e in errs {
$handler.emit_diagnostic(&e);
}
FatalError.raise()
}
}
})
}

pub fn parse_crate_from_file<'a>(input: &Path, sess: &'a ParseSess) -> PResult<'a, ast::Crate> {
let mut parser = new_parser_from_file(sess, input);
parser.parse_crate_mod()
Expand Down

0 comments on commit 0bfe483

Please sign in to comment.