Also split out emitters into their own module.
use rustc_front::util;
use rustc_front::intravisit as hir_visit;
use syntax::visit as ast_visit;
-use syntax::diagnostic;
+use syntax::errors;
/// Information about the registered lints.
///
match (sess, from_plugin) {
// We load builtin lints first, so a duplicate is a compiler bug.
// Use early_error when handling -W help with no crate.
- (None, _) => early_error(diagnostic::Auto, &msg[..]),
+ (None, _) => early_error(errors::ColorConfig::Auto, &msg[..]),
(Some(sess), false) => sess.bug(&msg[..]),
// A duplicate name from a plugin is a user error.
match (sess, from_plugin) {
// We load builtin lints first, so a duplicate is a compiler bug.
// Use early_error when handling -W help with no crate.
- (None, _) => early_error(diagnostic::Auto, &msg[..]),
+ (None, _) => early_error(errors::ColorConfig::Auto, &msg[..]),
(Some(sess), false) => sess.bug(&msg[..]),
// A duplicate name from a plugin is a user error.
use syntax::ast::{self, IntTy, UintTy};
use syntax::attr;
use syntax::attr::AttrMetaMethods;
-use syntax::diagnostic::{ColorConfig, Auto, Always, Never, SpanHandler};
+use syntax::errors::{ColorConfig, Handler};
use syntax::parse;
use syntax::parse::token::InternedString;
use syntax::feature_gate::UnstableFeatures;
debugging_opts: basic_debugging_options(),
prints: Vec::new(),
cg: basic_codegen_options(),
- color: Auto,
+ color: ColorConfig::Auto,
show_span: None,
externs: HashMap::new(),
crate_name: None,
v
}
-pub fn build_target_config(opts: &Options, sp: &SpanHandler) -> Config {
+pub fn build_target_config(opts: &Options, sp: &Handler) -> Config {
let target = match Target::search(&opts.target_triple) {
Ok(t) => t,
Err(e) => {
- panic!(sp.handler().fatal(&format!("Error loading target specification: {}", e)));
+ panic!(sp.fatal(&format!("Error loading target specification: {}", e)));
}
};
let (int_type, uint_type) = match &target.target_pointer_width[..] {
"32" => (ast::TyI32, ast::TyU32),
"64" => (ast::TyI64, ast::TyU64),
- w => panic!(sp.handler().fatal(&format!("target specification was invalid: \
- unrecognized target-pointer-width {}", w))),
+ w => panic!(sp.fatal(&format!("target specification was invalid: \
+ unrecognized target-pointer-width {}", w))),
};
Config {
pub fn build_session_options(matches: &getopts::Matches) -> Options {
let color = match matches.opt_str("color").as_ref().map(|s| &s[..]) {
- Some("auto") => Auto,
- Some("always") => Always,
- Some("never") => Never,
+ Some("auto") => ColorConfig::Auto,
+ Some("always") => ColorConfig::Always,
+ Some("never") => ColorConfig::Never,
- None => Auto,
+ None => ColorConfig::Auto,
Some(arg) => {
- early_error(Auto, &format!("argument for --color must be auto, always \
- or never (instead was `{}`)",
- arg))
+ early_error(ColorConfig::Auto, &format!("argument for --color must be auto, always \
+ or never (instead was `{}`)",
+ arg))
}
};
use syntax::ast::{NodeId, NodeIdAssigner, Name};
use syntax::codemap::Span;
-use syntax::diagnostic::{self, Emitter};
+use syntax::errors;
+use syntax::errors::emitter::{Emitter, BasicEmitter};
use syntax::diagnostics;
use syntax::feature_gate;
use syntax::parse;
if self.opts.treat_err_as_bug {
self.bug(msg);
}
- panic!(self.diagnostic().handler().fatal(msg))
+ panic!(self.diagnostic().fatal(msg))
}
pub fn span_err_or_warn(&self, is_warning: bool, sp: Span, msg: &str) {
if is_warning {
if self.opts.treat_err_as_bug {
self.bug(msg);
}
- self.diagnostic().handler().err(msg)
+ self.diagnostic().err(msg)
}
pub fn err_count(&self) -> usize {
- self.diagnostic().handler().err_count()
+ self.diagnostic().err_count()
}
pub fn has_errors(&self) -> bool {
- self.diagnostic().handler().has_errors()
+ self.diagnostic().has_errors()
}
pub fn abort_if_errors(&self) {
- self.diagnostic().handler().abort_if_errors();
+ self.diagnostic().abort_if_errors();
let delayed_bug = self.delayed_span_bug.borrow();
match *delayed_bug {
}
pub fn warn(&self, msg: &str) {
if self.can_print_warnings {
- self.diagnostic().handler().warn(msg)
+ self.diagnostic().warn(msg)
}
}
pub fn opt_span_warn(&self, opt_sp: Option<Span>, msg: &str) {
/// Prints out a message with a suggested edit of the code.
///
- /// See `diagnostic::RenderSpan::Suggestion` for more information.
+ /// See `errors::RenderSpan::Suggestion` for more information.
pub fn span_suggestion(&self, sp: Span, msg: &str, suggestion: String) {
self.diagnostic().span_suggestion(sp, msg, suggestion)
}
self.diagnostic().fileline_help(sp, msg)
}
pub fn note(&self, msg: &str) {
- self.diagnostic().handler().note(msg)
+ self.diagnostic().note(msg)
}
pub fn help(&self, msg: &str) {
- self.diagnostic().handler().help(msg)
+ self.diagnostic().help(msg)
}
pub fn opt_span_bug(&self, opt_sp: Option<Span>, msg: &str) -> ! {
match opt_sp {
self.diagnostic().span_bug(sp, msg)
}
pub fn bug(&self, msg: &str) -> ! {
- self.diagnostic().handler().bug(msg)
+ self.diagnostic().bug(msg)
}
pub fn span_unimpl(&self, sp: Span, msg: &str) -> ! {
self.diagnostic().span_unimpl(sp, msg)
}
pub fn unimpl(&self, msg: &str) -> ! {
- self.diagnostic().handler().unimpl(msg)
+ self.diagnostic().unimpl(msg)
}
pub fn add_lint(&self,
lint: &'static lint::Lint,
id
}
- pub fn diagnostic<'a>(&'a self) -> &'a diagnostic::SpanHandler {
+ pub fn diagnostic<'a>(&'a self) -> &'a errors::Handler {
&self.parse_sess.span_diagnostic
}
pub fn codemap<'a>(&'a self) -> &'a codemap::CodeMap {
.last()
.unwrap_or(true);
- let codemap = codemap::CodeMap::new();
+ let codemap = Rc::new(codemap::CodeMap::new());
let diagnostic_handler =
- diagnostic::Handler::new(sopts.color, Some(registry), can_print_warnings);
- let span_diagnostic_handler =
- diagnostic::SpanHandler::new(diagnostic_handler, codemap);
+ errors::Handler::new(sopts.color, Some(registry), can_print_warnings, codemap.clone());
- build_session_(sopts, local_crate_source_file, span_diagnostic_handler, cstore)
+ build_session_(sopts, local_crate_source_file, diagnostic_handler, codemap, cstore)
}
pub fn build_session_(sopts: config::Options,
local_crate_source_file: Option<PathBuf>,
- span_diagnostic: diagnostic::SpanHandler,
+ span_diagnostic: errors::Handler,
+ codemap: Rc<codemap::CodeMap>,
cstore: Rc<for<'a> CrateStore<'a>>)
-> Session {
let host = match Target::search(config::host_triple()) {
Ok(t) => t,
Err(e) => {
- panic!(span_diagnostic.handler()
- .fatal(&format!("Error loading host specification: {}", e)));
+ panic!(span_diagnostic.fatal(&format!("Error loading host specification: {}", e)));
}
};
let target_cfg = config::build_target_config(&sopts, &span_diagnostic);
- let p_s = parse::ParseSess::with_span_handler(span_diagnostic);
+ let p_s = parse::ParseSess::with_span_handler(span_diagnostic, codemap);
let default_sysroot = match sopts.maybe_sysroot {
Some(_) => None,
None => Some(filesearch::get_or_default_sysroot())
pub fn expect<T, M>(sess: &Session, opt: Option<T>, msg: M) -> T where
M: FnOnce() -> String,
{
- diagnostic::expect(sess.diagnostic(), opt, msg)
+ errors::expect(sess.diagnostic(), opt, msg)
}
-pub fn early_error(color: diagnostic::ColorConfig, msg: &str) -> ! {
- let mut emitter = diagnostic::EmitterWriter::stderr(color, None);
- emitter.emit(None, msg, None, diagnostic::Fatal);
- panic!(diagnostic::FatalError);
+pub fn early_error(color: errors::ColorConfig, msg: &str) -> ! {
+ let mut emitter = BasicEmitter::stderr(color);
+ emitter.emit(None, msg, None, errors::Level::Fatal);
+ panic!(errors::FatalError);
}
-pub fn early_warn(color: diagnostic::ColorConfig, msg: &str) {
- let mut emitter = diagnostic::EmitterWriter::stderr(color, None);
- emitter.emit(None, msg, None, diagnostic::Warning);
+pub fn early_warn(color: errors::ColorConfig, msg: &str) {
+ let mut emitter = BasicEmitter::stderr(color);
+ emitter.emit(None, msg, None, errors::Level::Warning);
}
use std::slice;
use std::path::{Path, PathBuf};
use session::early_error;
-use syntax::diagnostic;
+use syntax::errors;
#[derive(Clone, Debug)]
pub struct SearchPaths {
SearchPaths { paths: Vec::new() }
}
- pub fn add_path(&mut self, path: &str, color: diagnostic::ColorConfig) {
+ pub fn add_path(&mut self, path: &str, color: errors::ColorConfig) {
let (kind, path) = if path.starts_with("native=") {
(PathKind::Native, &path["native=".len()..])
} else if path.starts_with("crate=") {
use serialize::json::Json;
use std::default::Default;
use std::io::prelude::*;
-use syntax::{diagnostic, abi};
+use syntax::abi;
mod android_base;
mod apple_base;
pub fn from_json(obj: Json) -> Target {
// this is 1. ugly, 2. error prone.
-
- let handler = diagnostic::Handler::new(diagnostic::Auto, None, true);
-
let get_req_field = |name: &str| {
match obj.find(name)
.map(|s| s.as_string())
.and_then(|os| os.map(|s| s.to_string())) {
Some(val) => val,
None => {
- panic!(handler.fatal(&format!("Field {} in target specification is required",
- name)))
+ panic!("Field {} in target specification is required", name)
}
}
};
extern crate syntax;
extern crate syntax_ext;
-pub use syntax::diagnostic;
-
use driver::CompileController;
use pretty::{PpMode, UserIdentifiedItem};
use syntax::ast;
use syntax::parse;
-use syntax::diagnostic::Emitter;
+use syntax::errors;
+use syntax::errors::emitter::Emitter;
use syntax::diagnostics;
use syntax::parse::token;
fn early_callback(&mut self,
_: &getopts::Matches,
_: &diagnostics::registry::Registry,
- _: diagnostic::ColorConfig)
+ _: errors::ColorConfig)
-> Compilation {
Compilation::Continue
}
fn early_callback(&mut self,
matches: &getopts::Matches,
descriptions: &diagnostics::registry::Registry,
- color: diagnostic::ColorConfig)
+ color: errors::ColorConfig)
-> Compilation {
match matches.opt_str("explain") {
Some(ref code) => {
&opt.opt_group.short_name
};
if m.opt_present(opt_name) {
- early_error(diagnostic::Auto,
+ early_error(errors::ColorConfig::Auto,
&format!("use of unstable option '{}' requires -Z \
unstable-options",
opt_name));
}
m
}
- Err(f) => early_error(diagnostic::Auto, &f.to_string()),
+ Err(f) => early_error(errors::ColorConfig::Auto, &f.to_string()),
}
}
}
Err(value) => {
// Thread panicked without emitting a fatal diagnostic
- if !value.is::<diagnostic::FatalError>() {
- let mut emitter = diagnostic::EmitterWriter::stderr(diagnostic::Auto, None);
+ if !value.is::<errors::FatalError>() {
+ let mut emitter = errors::emitter::BasicEmitter::stderr(errors::ColorConfig::Auto);
// a .span_bug or .bug call has already printed what
// it wants to print.
- if !value.is::<diagnostic::ExplicitBug>() {
- emitter.emit(None, "unexpected panic", None, diagnostic::Bug);
+ if !value.is::<errors::ExplicitBug>() {
+ emitter.emit(None, "unexpected panic", None, errors::Level::Bug);
}
let xs = ["the compiler unexpectedly panicked. this is a bug.".to_string(),
format!("we would appreciate a bug report: {}", BUG_REPORT_URL)];
for note in &xs {
- emitter.emit(None, ¬e[..], None, diagnostic::Note)
+ emitter.emit(None, ¬e[..], None, errors::Level::Note)
}
if let None = env::var_os("RUST_BACKTRACE") {
emitter.emit(None,
"run with `RUST_BACKTRACE=1` for a backtrace",
None,
- diagnostic::Note);
+ errors::Level::Note);
}
println!("{}", str::from_utf8(&data.lock().unwrap()).unwrap());
use syntax::ast;
use syntax::owned_slice::OwnedSlice;
use syntax::codemap::{self, CodeMap, BytePos, Spanned};
-use syntax::diagnostic;
+use syntax::errors;
use syntax::parse::token::{self, BinOpToken};
use syntax::parse::lexer::comments;
use syntax::parse;
/// it can scan the input text for comments and literals to
/// copy forward.
pub fn print_crate<'a>(cm: &'a CodeMap,
- span_diagnostic: &diagnostic::SpanHandler,
+ span_diagnostic: &errors::Handler,
krate: &hir::Crate,
filename: String,
input: &mut Read,
impl<'a> State<'a> {
pub fn new_from_input(cm: &'a CodeMap,
- span_diagnostic: &diagnostic::SpanHandler,
+ span_diagnostic: &errors::Handler,
filename: String,
input: &mut Read,
out: Box<Write + 'a>,
use syntax::ast::{self, NodeId, Name, CRATE_NODE_ID, CrateNum};
use syntax::attr;
use syntax::attr::AttrMetaMethods;
-use syntax::diagnostic::SpanHandler;
+use syntax::errors::Handler;
use syntax::parse::token::special_idents;
use syntax;
use rbml::writer::Encoder;
Box<FnMut(&EncodeContext, &mut Encoder, InlinedItemRef) + 'a>;
pub struct EncodeParams<'a, 'tcx: 'a> {
- pub diag: &'a SpanHandler,
+ pub diag: &'a Handler,
pub tcx: &'a ty::ctxt<'tcx>,
pub reexports: &'a def::ExportMap,
pub item_symbols: &'a RefCell<NodeMap<String>>,
}
pub struct EncodeContext<'a, 'tcx: 'a> {
- pub diag: &'a SpanHandler,
+ pub diag: &'a Handler,
pub tcx: &'a ty::ctxt<'tcx>,
pub reexports: &'a def::ExportMap,
pub item_symbols: &'a RefCell<NodeMap<String>>,
rbml_w.wr_tagged_str(tag_items_data_item_symbol, x);
}
None => {
- ecx.diag.handler().bug(
- &format!("encode_symbol: id not found {}", id));
+ ecx.diag.bug(&format!("encode_symbol: id not found {}", id));
}
}
}
use rustc_llvm::{False, ObjectFile, mk_section_iter};
use rustc_llvm::archive_ro::ArchiveRO;
use syntax::codemap::Span;
-use syntax::diagnostic::SpanHandler;
+use syntax::errors::Handler;
use rustc_back::target::Target;
use std::cmp;
}
}
-pub fn note_crate_name(diag: &SpanHandler, name: &str) {
- diag.handler().note(&format!("crate name: {}", name));
+pub fn note_crate_name(diag: &Handler, name: &str) {
+ diag.note(&format!("crate name: {}", name));
}
impl ArchiveMetadata {
use syntax::abi::Abi;
use syntax::ast;
-use syntax::diagnostic::SpanHandler;
+use syntax::errors::Handler;
use rbml::writer::{self, Encoder};
macro_rules! mywrite { ($w:expr, $($arg:tt)*) => ({ write!($w.writer, $($arg)*); }) }
pub struct ctxt<'a, 'tcx: 'a> {
- pub diag: &'a SpanHandler,
+ pub diag: &'a Handler,
// Def -> str Callback:
pub ds: fn(DefId) -> String,
// The type context.
enc_bare_fn_ty(w, cx, f);
}
ty::TyInfer(_) => {
- cx.diag.handler().bug("cannot encode inference variable types");
+ cx.diag.bug("cannot encode inference variable types");
}
ty::TyParam(ParamTy {space, idx, name}) => {
mywrite!(w, "p[{}|{}|{}]", idx, space.to_uint(), name)
}
ty::ReVar(_) | ty::ReSkolemized(..) => {
// these should not crop up after typeck
- cx.diag.handler().bug("cannot encode region variables");
+ cx.diag.bug("cannot encode region variables");
}
}
}
use syntax::ast;
use syntax::attr;
use syntax::codemap::Span;
-use syntax::diagnostic;
+use syntax::errors;
use rustc_front::intravisit::Visitor;
use rustc_front::hir;
}
/// Find the function marked with `#[plugin_registrar]`, if any.
-pub fn find_plugin_registrar(diagnostic: &diagnostic::SpanHandler,
+pub fn find_plugin_registrar(diagnostic: &errors::Handler,
krate: &hir::Crate)
-> Option<ast::NodeId> {
let mut finder = RegistrarFinder { registrars: Vec::new() };
Some(node_id)
},
_ => {
- diagnostic.handler().err("multiple plugin registration functions found");
+ diagnostic.err("multiple plugin registration functions found");
for &(_, span) in &finder.registrars {
diagnostic.span_note(span, "one is here");
}
- diagnostic.handler().abort_if_errors();
+ diagnostic.abort_if_errors();
unreachable!();
}
}
if !llvm::LLVMRustLinkInExternalBitcode(llmod,
ptr as *const libc::c_char,
bc_decoded.len() as libc::size_t) {
- write::llvm_err(sess.diagnostic().handler(),
+ write::llvm_err(sess.diagnostic(),
format!("failed to load bc of `{}`",
&name[..]));
}
use util::common::time;
use util::common::path2cstr;
use syntax::codemap;
-use syntax::diagnostic;
-use syntax::diagnostic::{Emitter, Handler, Level};
+use syntax::errors::{self, Handler, Level};
+use syntax::errors::emitter::Emitter;
use std::collections::HashMap;
use std::ffi::{CStr, CString};
use std::thread;
use libc::{self, c_uint, c_int, c_void};
-pub fn llvm_err(handler: &diagnostic::Handler, msg: String) -> ! {
+pub fn llvm_err(handler: &errors::Handler, msg: String) -> ! {
unsafe {
let cstr = llvm::LLVMRustGetLastError();
if cstr == ptr::null() {
}
pub fn write_output_file(
- handler: &diagnostic::Handler,
+ handler: &errors::Handler,
target: llvm::TargetMachineRef,
pm: llvm::PassManagerRef,
m: ModuleRef,
}
impl Emitter for SharedEmitter {
- fn emit(&mut self, cmsp: Option<(&codemap::CodeMap, codemap::Span)>,
+ fn emit(&mut self, sp: Option<codemap::Span>,
msg: &str, code: Option<&str>, lvl: Level) {
- assert!(cmsp.is_none(), "SharedEmitter doesn't support spans");
+ assert!(sp.is_none(), "SharedEmitter doesn't support spans");
self.buffer.lock().unwrap().push(Diagnostic {
msg: msg.to_string(),
});
}
- fn custom_emit(&mut self, _cm: &codemap::CodeMap,
- _sp: diagnostic::RenderSpan, _msg: &str, _lvl: Level) {
+ fn custom_emit(&mut self, _sp: errors::RenderSpan, _msg: &str, _lvl: Level) {
panic!("SharedEmitter doesn't support custom_emit");
}
}
};
if tm.is_null() {
- llvm_err(sess.diagnostic().handler(),
+ llvm_err(sess.diagnostic(),
format!("Could not create LLVM TargetMachine for triple: {}",
triple).to_string());
} else {
fn new_with_session(sess: &'a Session, reachable: &'a [String]) -> CodegenContext<'a> {
CodegenContext {
lto_ctxt: Some((sess, reachable)),
- handler: sess.diagnostic().handler(),
+ handler: sess.diagnostic(),
plugin_passes: sess.plugin_llvm_passes.borrow().clone(),
remark: sess.opts.cg.remark.clone(),
worker: 0,
},
}
// Display any new diagnostics.
- diag_emitter.dump(sess.diagnostic().handler());
+ diag_emitter.dump(sess.diagnostic());
}
if panicked {
sess.fatal("aborting due to worker thread panic");
use rustc_front::lowering::{lower_crate, LoweringContext};
use rustc_metadata::cstore::CStore;
-use syntax::{ast, codemap, diagnostic};
+use syntax::{ast, codemap, errors};
+use syntax::errors::emitter::ColorConfig;
use syntax::feature_gate::UnstableFeatures;
use syntax::parse::token;
..config::basic_options().clone()
};
- let codemap = codemap::CodeMap::new();
- let diagnostic_handler = diagnostic::Handler::new(diagnostic::Auto, None, true);
- let span_diagnostic_handler =
- diagnostic::SpanHandler::new(diagnostic_handler, codemap);
+ let codemap = Rc::new(codemap::CodeMap::new());
+ let diagnostic_handler = errors::Handler::new(ColorConfig::Auto,
+ None,
+ true,
+ false,
+ codemap.clone());
let cstore = Rc::new(CStore::new(token::get_ident_interner()));
let cstore_ = ::rustc_driver::cstore_to_cratestore(cstore.clone());
- let sess = session::build_session_(sessopts, cpath,
- span_diagnostic_handler, cstore_);
+ let sess = session::build_session_(sessopts, cpath, diagnostic_handler, codemap, cstore_);
rustc_lint::register_builtins(&mut sess.lint_store.borrow_mut(), Some(&sess));
let mut cfg = config::build_configuration(&sess);
use serialize::Decodable;
use serialize::json::{self, Json};
use rustc::session::search_paths::SearchPaths;
-use syntax::diagnostic;
+use syntax::errors::emitter::ColorConfig;
// reexported from `clean` so it can be easily updated with the mod itself
pub use clean::SCHEMA_VERSION;
let mut libs = SearchPaths::new();
for s in &matches.opt_strs("L") {
- libs.add_path(s, diagnostic::Auto);
+ libs.add_path(s, ColorConfig::Auto);
}
let externs = match parse_externs(&matches) {
Ok(ex) => ex,
// First, parse the crate and extract all relevant information.
let mut paths = SearchPaths::new();
for s in &matches.opt_strs("L") {
- paths.add_path(s, diagnostic::Auto);
+ paths.add_path(s, ColorConfig::Auto);
}
let cfgs = matches.opt_strs("cfg");
let triple = matches.opt_str("target");
use rustc_driver::{driver, Compilation};
use rustc_metadata::cstore::CStore;
use syntax::codemap::CodeMap;
-use syntax::diagnostic;
+use syntax::errors;
+use syntax::errors::emitter::ColorConfig;
use syntax::parse::token;
use core;
..config::basic_options().clone()
};
- let codemap = CodeMap::new();
- let diagnostic_handler = diagnostic::Handler::new(diagnostic::Auto, None, true);
- let span_diagnostic_handler =
- diagnostic::SpanHandler::new(diagnostic_handler, codemap);
+ let codemap = Rc::new(CodeMap::new());
+ let diagnostic_handler = errors::Handler::new(ColorConfig::Auto,
+ None,
+ true,
+ false,
+ codemap.clone());
let cstore = Rc::new(CStore::new(token::get_ident_interner()));
let cstore_ = ::rustc_driver::cstore_to_cratestore(cstore.clone());
let sess = session::build_session_(sessopts,
Some(input_path.clone()),
- span_diagnostic_handler,
+ diagnostic_handler,
+ codemap,
cstore_);
rustc_lint::register_builtins(&mut sess.lint_store.borrow_mut(), Some(&sess));
}
}
let data = Arc::new(Mutex::new(Vec::new()));
- let emitter = diagnostic::EmitterWriter::new(box Sink(data.clone()), None);
+ let codemap = Rc::new(CodeMap::new());
+ let emitter = errors::emitter::EmitterWriter::new(box Sink(data.clone()), None, codemap.clone());
let old = io::set_panic(box Sink(data.clone()));
let _bomb = Bomb(data, old.unwrap_or(box io::stdout()));
// Compile the code
- let codemap = CodeMap::new();
- let diagnostic_handler = diagnostic::Handler::with_emitter(true, box emitter);
- let span_diagnostic_handler =
- diagnostic::SpanHandler::new(diagnostic_handler, codemap);
+ let diagnostic_handler = errors::Handler::with_emitter(true, false, box emitter);
let cstore = Rc::new(CStore::new(token::get_ident_interner()));
let cstore_ = ::rustc_driver::cstore_to_cratestore(cstore.clone());
let sess = session::build_session_(sessopts,
None,
- span_diagnostic_handler,
+ diagnostic_handler,
+ codemap,
cstore_);
rustc_lint::register_builtins(&mut sess.lint_store.borrow_mut(), Some(&sess));
use codemap::{Span, Spanned, spanned, dummy_spanned};
use codemap::BytePos;
use config::CfgDiag;
-use diagnostic::SpanHandler;
+use errors::Handler;
use feature_gate::{GatedCfg, GatedCfgAttr};
use parse::lexer::comments::{doc_comment_style, strip_doc_comment_decoration};
use parse::token::{InternedString, intern_and_get_ident};
}
/// Find the value of #[export_name=*] attribute and check its validity.
-pub fn find_export_name_attr(diag: &SpanHandler, attrs: &[Attribute]) -> Option<InternedString> {
+pub fn find_export_name_attr(diag: &Handler, attrs: &[Attribute]) -> Option<InternedString> {
attrs.iter().fold(None, |ia,attr| {
if attr.check_name("export_name") {
if let s@Some(_) = attr.value_str() {
s
} else {
diag.span_err(attr.span, "export_name attribute has invalid format");
- diag.handler.help("use #[export_name=\"*\"]");
+ diag.help("use #[export_name=\"*\"]");
None
}
} else {
}
/// Determine what `#[inline]` attribute is present in `attrs`, if any.
-pub fn find_inline_attr(diagnostic: Option<&SpanHandler>, attrs: &[Attribute]) -> InlineAttr {
+pub fn find_inline_attr(diagnostic: Option<&Handler>, attrs: &[Attribute]) -> InlineAttr {
attrs.iter().fold(InlineAttr::None, |ia,attr| {
match attr.node.value.node {
MetaWord(ref n) if *n == "inline" => {
pub fn is_stable(&self) -> bool { if let Stable {..} = *self { true } else { false }}
}
-fn find_stability_generic<'a, I>(diagnostic: &SpanHandler,
+fn find_stability_generic<'a, I>(diagnostic: &Handler,
attrs_iter: I,
item_sp: Span)
-> Option<Stability>
stab
}
-fn find_deprecation_generic<'a, I>(diagnostic: &SpanHandler,
- attrs_iter: I,
- item_sp: Span)
- -> Option<Deprecation>
+fn find_deprecation_generic<'a, I>(diagnostic: &Handler,
+ attrs_iter: I,
+ item_sp: Span)
+ -> Option<Deprecation>
where I: Iterator<Item = &'a Attribute>
{
let mut depr: Option<Deprecation> = None;
}
/// Find the first stability attribute. `None` if none exists.
-pub fn find_stability(diagnostic: &SpanHandler, attrs: &[Attribute],
+pub fn find_stability(diagnostic: &Handler, attrs: &[Attribute],
item_sp: Span) -> Option<Stability> {
find_stability_generic(diagnostic, attrs.iter(), item_sp)
}
/// Find the deprecation attribute. `None` if none exists.
-pub fn find_deprecation(diagnostic: &SpanHandler, attrs: &[Attribute],
- item_sp: Span) -> Option<Deprecation> {
+pub fn find_deprecation(diagnostic: &Handler, attrs: &[Attribute],
+ item_sp: Span) -> Option<Deprecation> {
find_deprecation_generic(diagnostic, attrs.iter(), item_sp)
}
-pub fn require_unique_names(diagnostic: &SpanHandler, metas: &[P<MetaItem>]) {
+pub fn require_unique_names(diagnostic: &Handler, metas: &[P<MetaItem>]) {
let mut set = HashSet::new();
for meta in metas {
let name = meta.name();
/// `int_type_of_word`, below) to specify enum discriminant type; `C`, to use
/// the same discriminant size that the corresponding C enum would or C
/// structure layout, and `packed` to remove padding.
-pub fn find_repr_attrs(diagnostic: &SpanHandler, attr: &Attribute) -> Vec<ReprAttr> {
+pub fn find_repr_attrs(diagnostic: &Handler, attr: &Attribute) -> Vec<ReprAttr> {
let mut acc = Vec::new();
match attr.node.value.node {
ast::MetaList(ref s, ref items) if *s == "repr" => {
// except according to those terms.
use attr::AttrMetaMethods;
-use diagnostic::SpanHandler;
+use errors::Handler;
use feature_gate::GatedCfgAttr;
use fold::Folder;
use {ast, fold, attr};
/// configuration.
struct Context<'a, F> where F: FnMut(&[ast::Attribute]) -> bool {
in_cfg: F,
- diagnostic: &'a SpanHandler,
+ diagnostic: &'a Handler,
}
// Support conditional compilation by transforming the AST, stripping out
// any items that do not belong in the current configuration
-pub fn strip_unconfigured_items(diagnostic: &SpanHandler, krate: ast::Crate,
+pub fn strip_unconfigured_items(diagnostic: &Handler, krate: ast::Crate,
feature_gated_cfgs: &mut Vec<GatedCfgAttr>)
-> ast::Crate
{
}
}
-pub fn strip_items<'a, F>(diagnostic: &'a SpanHandler,
+pub fn strip_items<'a, F>(diagnostic: &'a Handler,
krate: ast::Crate, in_cfg: F) -> ast::Crate where
F: FnMut(&[ast::Attribute]) -> bool,
{
}
// Process `#[cfg_attr]`.
-fn process_cfg_attr(diagnostic: &SpanHandler, krate: ast::Crate,
+fn process_cfg_attr(diagnostic: &Handler, krate: ast::Crate,
feature_gated_cfgs: &mut Vec<GatedCfgAttr>) -> ast::Crate {
let mut fld = CfgAttrFolder {
diag: CfgDiagReal {
}
pub trait CfgDiag {
- fn emit_error<F>(&mut self, f: F) where F: FnMut(&SpanHandler);
+ fn emit_error<F>(&mut self, f: F) where F: FnMut(&Handler);
fn flag_gated<F>(&mut self, f: F) where F: FnMut(&mut Vec<GatedCfgAttr>);
}
pub struct CfgDiagReal<'a, 'b> {
- pub diag: &'a SpanHandler,
+ pub diag: &'a Handler,
pub feature_gated_cfgs: &'b mut Vec<GatedCfgAttr>,
}
impl<'a, 'b> CfgDiag for CfgDiagReal<'a, 'b> {
- fn emit_error<F>(&mut self, mut f: F) where F: FnMut(&SpanHandler) {
+ fn emit_error<F>(&mut self, mut f: F) where F: FnMut(&Handler) {
f(self.diag)
}
fn flag_gated<F>(&mut self, mut f: F) where F: FnMut(&mut Vec<GatedCfgAttr>) {
}
impl CfgDiag for CfgDiagSilent {
- fn emit_error<F>(&mut self, _: F) where F: FnMut(&SpanHandler) {
+ fn emit_error<F>(&mut self, _: F) where F: FnMut(&Handler) {
self.error = true;
}
fn flag_gated<F>(&mut self, _: F) where F: FnMut(&mut Vec<GatedCfgAttr>) {}
+++ /dev/null
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub use self::Level::*;
-pub use self::RenderSpan::*;
-pub use self::ColorConfig::*;
-use self::Destination::*;
-
-use codemap::{self, COMMAND_LINE_SP, COMMAND_LINE_EXPN, Pos, Span};
-use diagnostics;
-
-use std::cell::{RefCell, Cell};
-use std::{cmp, error, fmt};
-use std::io::prelude::*;
-use std::io;
-use term;
-
-/// maximum number of lines we will print for each error; arbitrary.
-const MAX_LINES: usize = 6;
-
-#[derive(Clone)]
-pub enum RenderSpan {
- /// A FullSpan renders with both with an initial line for the
- /// message, prefixed by file:linenum, followed by a summary of
- /// the source code covered by the span.
- FullSpan(Span),
-
- /// Similar to a FullSpan, but the cited position is the end of
- /// the span, instead of the start. Used, at least, for telling
- /// compiletest/runtest to look at the last line of the span
- /// (since `end_highlight_lines` displays an arrow to the end
- /// of the span).
- EndSpan(Span),
-
- /// A suggestion renders with both with an initial line for the
- /// message, prefixed by file:linenum, followed by a summary
- /// of hypothetical source code, where the `String` is spliced
- /// into the lines in place of the code covered by the span.
- Suggestion(Span, String),
-
- /// A FileLine renders with just a line for the message prefixed
- /// by file:linenum.
- FileLine(Span),
-}
-
-impl RenderSpan {
- fn span(&self) -> Span {
- match *self {
- FullSpan(s) |
- Suggestion(s, _) |
- EndSpan(s) |
- FileLine(s) =>
- s
- }
- }
-}
-
-#[derive(Clone, Copy)]
-pub enum ColorConfig {
- Auto,
- Always,
- Never
-}
-
-pub trait Emitter {
- fn emit(&mut self, cmsp: Option<(&codemap::CodeMap, Span)>,
- msg: &str, code: Option<&str>, lvl: Level);
- fn custom_emit(&mut self, cm: &codemap::CodeMap,
- sp: RenderSpan, msg: &str, lvl: Level);
-}
-
-/// Used as a return value to signify a fatal error occurred. (It is also
-/// used as the argument to panic at the moment, but that will eventually
-/// not be true.)
-#[derive(Copy, Clone, Debug)]
-#[must_use]
-pub struct FatalError;
-
-impl fmt::Display for FatalError {
- fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
- write!(f, "parser fatal error")
- }
-}
-
-impl error::Error for FatalError {
- fn description(&self) -> &str {
- "The parser has encountered a fatal error"
- }
-}
-
-/// Signifies that the compiler died with an explicit call to `.bug`
-/// or `.span_bug` rather than a failed assertion, etc.
-#[derive(Copy, Clone, Debug)]
-pub struct ExplicitBug;
-
-impl fmt::Display for ExplicitBug {
- fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
- write!(f, "parser internal bug")
- }
-}
-
-impl error::Error for ExplicitBug {
- fn description(&self) -> &str {
- "The parser has encountered an internal bug"
- }
-}
-
-/// A span-handler is like a handler but also
-/// accepts span information for source-location
-/// reporting.
-pub struct SpanHandler {
- pub handler: Handler,
- pub cm: codemap::CodeMap,
-}
-
-impl SpanHandler {
- pub fn new(handler: Handler, cm: codemap::CodeMap) -> SpanHandler {
- SpanHandler {
- handler: handler,
- cm: cm,
- }
- }
- pub fn span_fatal(&self, sp: Span, msg: &str) -> FatalError {
- self.handler.emit(Some((&self.cm, sp)), msg, Fatal);
- return FatalError;
- }
- pub fn span_fatal_with_code(&self, sp: Span, msg: &str, code: &str) -> FatalError {
- self.handler.emit_with_code(Some((&self.cm, sp)), msg, code, Fatal);
- return FatalError;
- }
- pub fn span_err(&self, sp: Span, msg: &str) {
- self.handler.emit(Some((&self.cm, sp)), msg, Error);
- self.handler.bump_err_count();
- }
- pub fn span_err_with_code(&self, sp: Span, msg: &str, code: &str) {
- self.handler.emit_with_code(Some((&self.cm, sp)), msg, code, Error);
- self.handler.bump_err_count();
- }
- pub fn span_warn(&self, sp: Span, msg: &str) {
- self.handler.emit(Some((&self.cm, sp)), msg, Warning);
- }
- pub fn span_warn_with_code(&self, sp: Span, msg: &str, code: &str) {
- self.handler.emit_with_code(Some((&self.cm, sp)), msg, code, Warning);
- }
- pub fn span_note(&self, sp: Span, msg: &str) {
- self.handler.emit(Some((&self.cm, sp)), msg, Note);
- }
- pub fn span_end_note(&self, sp: Span, msg: &str) {
- self.handler.custom_emit(&self.cm, EndSpan(sp), msg, Note);
- }
- pub fn span_help(&self, sp: Span, msg: &str) {
- self.handler.emit(Some((&self.cm, sp)), msg, Help);
- }
- /// Prints out a message with a suggested edit of the code.
- ///
- /// See `diagnostic::RenderSpan::Suggestion` for more information.
- pub fn span_suggestion(&self, sp: Span, msg: &str, suggestion: String) {
- self.handler.custom_emit(&self.cm, Suggestion(sp, suggestion), msg, Help);
- }
- pub fn fileline_note(&self, sp: Span, msg: &str) {
- self.handler.custom_emit(&self.cm, FileLine(sp), msg, Note);
- }
- pub fn fileline_help(&self, sp: Span, msg: &str) {
- self.handler.custom_emit(&self.cm, FileLine(sp), msg, Help);
- }
- pub fn span_bug(&self, sp: Span, msg: &str) -> ! {
- self.handler.emit(Some((&self.cm, sp)), msg, Bug);
- panic!(ExplicitBug);
- }
- pub fn span_bug_no_panic(&self, sp: Span, msg: &str) {
- self.handler.emit(Some((&self.cm, sp)), msg, Bug);
- self.handler.bump_err_count();
- }
- pub fn span_unimpl(&self, sp: Span, msg: &str) -> ! {
- self.span_bug(sp, &format!("unimplemented {}", msg));
- }
- pub fn handler<'a>(&'a self) -> &'a Handler {
- &self.handler
- }
-}
-
-/// A handler deals with errors; certain errors
-/// (fatal, bug, unimpl) may cause immediate exit,
-/// others log errors for later reporting.
-pub struct Handler {
- err_count: Cell<usize>,
- emit: RefCell<Box<Emitter + Send>>,
- pub can_emit_warnings: bool
-}
-
-impl Handler {
- pub fn new(color_config: ColorConfig,
- registry: Option<diagnostics::registry::Registry>,
- can_emit_warnings: bool) -> Handler {
- let emitter = Box::new(EmitterWriter::stderr(color_config, registry));
- Handler::with_emitter(can_emit_warnings, emitter)
- }
- pub fn with_emitter(can_emit_warnings: bool, e: Box<Emitter + Send>) -> Handler {
- Handler {
- err_count: Cell::new(0),
- emit: RefCell::new(e),
- can_emit_warnings: can_emit_warnings
- }
- }
- pub fn fatal(&self, msg: &str) -> FatalError {
- self.emit.borrow_mut().emit(None, msg, None, Fatal);
- FatalError
- }
- pub fn err(&self, msg: &str) {
- self.emit.borrow_mut().emit(None, msg, None, Error);
- self.bump_err_count();
- }
- pub fn bump_err_count(&self) {
- self.err_count.set(self.err_count.get() + 1);
- }
- pub fn err_count(&self) -> usize {
- self.err_count.get()
- }
- pub fn has_errors(&self) -> bool {
- self.err_count.get() > 0
- }
- pub fn abort_if_errors(&self) {
- let s;
- match self.err_count.get() {
- 0 => return,
- 1 => s = "aborting due to previous error".to_string(),
- _ => {
- s = format!("aborting due to {} previous errors",
- self.err_count.get());
- }
- }
-
- panic!(self.fatal(&s[..]));
- }
- pub fn warn(&self, msg: &str) {
- self.emit.borrow_mut().emit(None, msg, None, Warning);
- }
- pub fn note(&self, msg: &str) {
- self.emit.borrow_mut().emit(None, msg, None, Note);
- }
- pub fn help(&self, msg: &str) {
- self.emit.borrow_mut().emit(None, msg, None, Help);
- }
- pub fn bug(&self, msg: &str) -> ! {
- self.emit.borrow_mut().emit(None, msg, None, Bug);
- panic!(ExplicitBug);
- }
- pub fn unimpl(&self, msg: &str) -> ! {
- self.bug(&format!("unimplemented {}", msg));
- }
- pub fn emit(&self,
- cmsp: Option<(&codemap::CodeMap, Span)>,
- msg: &str,
- lvl: Level) {
- if lvl == Warning && !self.can_emit_warnings { return }
- self.emit.borrow_mut().emit(cmsp, msg, None, lvl);
- }
- pub fn emit_with_code(&self,
- cmsp: Option<(&codemap::CodeMap, Span)>,
- msg: &str,
- code: &str,
- lvl: Level) {
- if lvl == Warning && !self.can_emit_warnings { return }
- self.emit.borrow_mut().emit(cmsp, msg, Some(code), lvl);
- }
- pub fn custom_emit(&self, cm: &codemap::CodeMap,
- sp: RenderSpan, msg: &str, lvl: Level) {
- if lvl == Warning && !self.can_emit_warnings { return }
- self.emit.borrow_mut().custom_emit(cm, sp, msg, lvl);
- }
-}
-
-#[derive(Copy, PartialEq, Clone, Debug)]
-pub enum Level {
- Bug,
- Fatal,
- Error,
- Warning,
- Note,
- Help,
-}
-
-impl fmt::Display for Level {
- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
- use std::fmt::Display;
-
- match *self {
- Bug => "error: internal compiler error".fmt(f),
- Fatal | Error => "error".fmt(f),
- Warning => "warning".fmt(f),
- Note => "note".fmt(f),
- Help => "help".fmt(f),
- }
- }
-}
-
-impl Level {
- fn color(self) -> term::color::Color {
- match self {
- Bug | Fatal | Error => term::color::BRIGHT_RED,
- Warning => term::color::BRIGHT_YELLOW,
- Note => term::color::BRIGHT_GREEN,
- Help => term::color::BRIGHT_CYAN,
- }
- }
-}
-
-pub struct EmitterWriter {
- dst: Destination,
- registry: Option<diagnostics::registry::Registry>
-}
-
-enum Destination {
- Terminal(Box<term::StderrTerminal>),
- Raw(Box<Write + Send>),
-}
-
-/// Do not use this for messages that end in `\n` – use `println_maybe_styled` instead. See
-/// `EmitterWriter::print_maybe_styled` for details.
-macro_rules! print_maybe_styled {
- ($writer: expr, $style: expr, $($arg: tt)*) => {
- $writer.print_maybe_styled(format_args!($($arg)*), $style, false)
- }
-}
-
-macro_rules! println_maybe_styled {
- ($writer: expr, $style: expr, $($arg: tt)*) => {
- $writer.print_maybe_styled(format_args!($($arg)*), $style, true)
- }
-}
-
-impl EmitterWriter {
- pub fn stderr(color_config: ColorConfig,
- registry: Option<diagnostics::registry::Registry>) -> EmitterWriter {
- let stderr = io::stderr();
-
- let use_color = match color_config {
- Always => true,
- Never => false,
- Auto => stderr_isatty(),
- };
-
- if use_color {
- let dst = match term::stderr() {
- Some(t) => Terminal(t),
- None => Raw(Box::new(stderr)),
- };
- EmitterWriter { dst: dst, registry: registry }
- } else {
- EmitterWriter { dst: Raw(Box::new(stderr)), registry: registry }
- }
- }
-
- pub fn new(dst: Box<Write + Send>,
- registry: Option<diagnostics::registry::Registry>) -> EmitterWriter {
- EmitterWriter { dst: Raw(dst), registry: registry }
- }
-
- fn print_maybe_styled(&mut self,
- args: fmt::Arguments,
- color: term::Attr,
- print_newline_at_end: bool) -> io::Result<()> {
- match self.dst {
- Terminal(ref mut t) => {
- try!(t.attr(color));
- // If `msg` ends in a newline, we need to reset the color before
- // the newline. We're making the assumption that we end up writing
- // to a `LineBufferedWriter`, which means that emitting the reset
- // after the newline ends up buffering the reset until we print
- // another line or exit. Buffering the reset is a problem if we're
- // sharing the terminal with any other programs (e.g. other rustc
- // instances via `make -jN`).
- //
- // Note that if `msg` contains any internal newlines, this will
- // result in the `LineBufferedWriter` flushing twice instead of
- // once, which still leaves the opportunity for interleaved output
- // to be miscolored. We assume this is rare enough that we don't
- // have to worry about it.
- try!(t.write_fmt(args));
- try!(t.reset());
- if print_newline_at_end {
- t.write_all(b"\n")
- } else {
- Ok(())
- }
- }
- Raw(ref mut w) => {
- try!(w.write_fmt(args));
- if print_newline_at_end {
- w.write_all(b"\n")
- } else {
- Ok(())
- }
- }
- }
- }
-
- fn print_diagnostic(&mut self, topic: &str, lvl: Level,
- msg: &str, code: Option<&str>) -> io::Result<()> {
- if !topic.is_empty() {
- try!(write!(&mut self.dst, "{} ", topic));
- }
-
- try!(print_maybe_styled!(self, term::Attr::ForegroundColor(lvl.color()),
- "{}: ", lvl.to_string()));
- try!(print_maybe_styled!(self, term::Attr::Bold, "{}", msg));
-
- match code {
- Some(code) => {
- let style = term::Attr::ForegroundColor(term::color::BRIGHT_MAGENTA);
- try!(print_maybe_styled!(self, style, " [{}]", code.clone()));
- }
- None => ()
- }
- try!(write!(&mut self.dst, "\n"));
- Ok(())
- }
-
- fn emit_(&mut self, cm: &codemap::CodeMap, rsp: RenderSpan,
- msg: &str, code: Option<&str>, lvl: Level) -> io::Result<()> {
- let sp = rsp.span();
-
- // We cannot check equality directly with COMMAND_LINE_SP
- // since PartialEq is manually implemented to ignore the ExpnId
- let ss = if sp.expn_id == COMMAND_LINE_EXPN {
- "<command line option>".to_string()
- } else if let EndSpan(_) = rsp {
- let span_end = Span { lo: sp.hi, hi: sp.hi, expn_id: sp.expn_id};
- cm.span_to_string(span_end)
- } else {
- cm.span_to_string(sp)
- };
-
- try!(self.print_diagnostic(&ss[..], lvl, msg, code));
-
- match rsp {
- FullSpan(_) => {
- try!(self.highlight_lines(cm, sp, lvl, cm.span_to_lines(sp)));
- try!(self.print_macro_backtrace(cm, sp));
- }
- EndSpan(_) => {
- try!(self.end_highlight_lines(cm, sp, lvl, cm.span_to_lines(sp)));
- try!(self.print_macro_backtrace(cm, sp));
- }
- Suggestion(_, ref suggestion) => {
- try!(self.highlight_suggestion(cm, sp, suggestion));
- try!(self.print_macro_backtrace(cm, sp));
- }
- FileLine(..) => {
- // no source text in this case!
- }
- }
-
- match code {
- Some(code) =>
- match self.registry.as_ref().and_then(|registry| registry.find_description(code)) {
- Some(_) => {
- try!(self.print_diagnostic(&ss[..], Help,
- &format!("run `rustc --explain {}` to see a \
- detailed explanation", code), None));
- }
- None => ()
- },
- None => (),
- }
- Ok(())
- }
-
- fn highlight_suggestion(&mut self,
- cm: &codemap::CodeMap,
- sp: Span,
- suggestion: &str)
- -> io::Result<()>
- {
- let lines = cm.span_to_lines(sp).unwrap();
- assert!(!lines.lines.is_empty());
-
- // To build up the result, we want to take the snippet from the first
- // line that precedes the span, prepend that with the suggestion, and
- // then append the snippet from the last line that trails the span.
- let fm = &lines.file;
-
- let first_line = &lines.lines[0];
- let prefix = fm.get_line(first_line.line_index)
- .map(|l| &l[..first_line.start_col.0])
- .unwrap_or("");
-
- let last_line = lines.lines.last().unwrap();
- let suffix = fm.get_line(last_line.line_index)
- .map(|l| &l[last_line.end_col.0..])
- .unwrap_or("");
-
- let complete = format!("{}{}{}", prefix, suggestion, suffix);
-
- // print the suggestion without any line numbers, but leave
- // space for them. This helps with lining up with previous
- // snippets from the actual error being reported.
- let fm = &*lines.file;
- let mut lines = complete.lines();
- for (line, line_index) in lines.by_ref().take(MAX_LINES).zip(first_line.line_index..) {
- let elided_line_num = format!("{}", line_index+1);
- try!(write!(&mut self.dst, "{0}:{1:2$} {3}\n",
- fm.name, "", elided_line_num.len(), line));
- }
-
- // if we elided some lines, add an ellipsis
- if lines.next().is_some() {
- let elided_line_num = format!("{}", first_line.line_index + MAX_LINES + 1);
- try!(write!(&mut self.dst, "{0:1$} {0:2$} ...\n",
- "", fm.name.len(), elided_line_num.len()));
- }
-
- Ok(())
- }
-
- fn highlight_lines(&mut self,
- cm: &codemap::CodeMap,
- sp: Span,
- lvl: Level,
- lines: codemap::FileLinesResult)
- -> io::Result<()>
- {
- let lines = match lines {
- Ok(lines) => lines,
- Err(_) => {
- try!(write!(&mut self.dst, "(internal compiler error: unprintable span)\n"));
- return Ok(());
- }
- };
-
- let fm = &*lines.file;
-
- let line_strings: Option<Vec<&str>> =
- lines.lines.iter()
- .map(|info| fm.get_line(info.line_index))
- .collect();
-
- let line_strings = match line_strings {
- None => { return Ok(()); }
- Some(line_strings) => line_strings
- };
-
- // Display only the first MAX_LINES lines.
- let all_lines = lines.lines.len();
- let display_lines = cmp::min(all_lines, MAX_LINES);
- let display_line_infos = &lines.lines[..display_lines];
- let display_line_strings = &line_strings[..display_lines];
-
- // Calculate the widest number to format evenly and fix #11715
- assert!(display_line_infos.len() > 0);
- let mut max_line_num = display_line_infos[display_line_infos.len() - 1].line_index + 1;
- let mut digits = 0;
- while max_line_num > 0 {
- max_line_num /= 10;
- digits += 1;
- }
-
- // Print the offending lines
- for (line_info, line) in display_line_infos.iter().zip(display_line_strings) {
- try!(write!(&mut self.dst, "{}:{:>width$} {}\n",
- fm.name,
- line_info.line_index + 1,
- line,
- width=digits));
- }
-
- // If we elided something, put an ellipsis.
- if display_lines < all_lines {
- let last_line_index = display_line_infos.last().unwrap().line_index;
- let s = format!("{}:{} ", fm.name, last_line_index + 1);
- try!(write!(&mut self.dst, "{0:1$}...\n", "", s.len()));
- }
-
- // FIXME (#3260)
- // If there's one line at fault we can easily point to the problem
- if lines.lines.len() == 1 {
- let lo = cm.lookup_char_pos(sp.lo);
- let mut digits = 0;
- let mut num = (lines.lines[0].line_index + 1) / 10;
-
- // how many digits must be indent past?
- while num > 0 { num /= 10; digits += 1; }
-
- let mut s = String::new();
- // Skip is the number of characters we need to skip because they are
- // part of the 'filename:line ' part of the previous line.
- let skip = fm.name.chars().count() + digits + 3;
- for _ in 0..skip {
- s.push(' ');
- }
- if let Some(orig) = fm.get_line(lines.lines[0].line_index) {
- let mut col = skip;
- let mut lastc = ' ';
- let mut iter = orig.chars().enumerate();
- for (pos, ch) in iter.by_ref() {
- lastc = ch;
- if pos >= lo.col.to_usize() { break; }
- // Whenever a tab occurs on the previous line, we insert one on
- // the error-point-squiggly-line as well (instead of a space).
- // That way the squiggly line will usually appear in the correct
- // position.
- match ch {
- '\t' => {
- col += 8 - col%8;
- s.push('\t');
- },
- _ => {
- col += 1;
- s.push(' ');
- },
- }
- }
-
- try!(write!(&mut self.dst, "{}", s));
- let mut s = String::from("^");
- let count = match lastc {
- // Most terminals have a tab stop every eight columns by default
- '\t' => 8 - col%8,
- _ => 1,
- };
- col += count;
- s.extend(::std::iter::repeat('~').take(count));
-
- let hi = cm.lookup_char_pos(sp.hi);
- if hi.col != lo.col {
- for (pos, ch) in iter {
- if pos >= hi.col.to_usize() { break; }
- let count = match ch {
- '\t' => 8 - col%8,
- _ => 1,
- };
- col += count;
- s.extend(::std::iter::repeat('~').take(count));
- }
- }
-
- if s.len() > 1 {
- // One extra squiggly is replaced by a "^"
- s.pop();
- }
-
- try!(println_maybe_styled!(self, term::Attr::ForegroundColor(lvl.color()),
- "{}", s));
- }
- }
- Ok(())
- }
-
- /// Here are the differences between this and the normal `highlight_lines`:
- /// `end_highlight_lines` will always put arrow on the last byte of the
- /// span (instead of the first byte). Also, when the span is too long (more
- /// than 6 lines), `end_highlight_lines` will print the first line, then
- /// dot dot dot, then last line, whereas `highlight_lines` prints the first
- /// six lines.
- #[allow(deprecated)]
- fn end_highlight_lines(&mut self,
- cm: &codemap::CodeMap,
- sp: Span,
- lvl: Level,
- lines: codemap::FileLinesResult)
- -> io::Result<()> {
- let lines = match lines {
- Ok(lines) => lines,
- Err(_) => {
- try!(write!(&mut self.dst, "(internal compiler error: unprintable span)\n"));
- return Ok(());
- }
- };
-
- let fm = &*lines.file;
-
- let lines = &lines.lines[..];
- if lines.len() > MAX_LINES {
- if let Some(line) = fm.get_line(lines[0].line_index) {
- try!(write!(&mut self.dst, "{}:{} {}\n", fm.name,
- lines[0].line_index + 1, line));
- }
- try!(write!(&mut self.dst, "...\n"));
- let last_line_index = lines[lines.len() - 1].line_index;
- if let Some(last_line) = fm.get_line(last_line_index) {
- try!(write!(&mut self.dst, "{}:{} {}\n", fm.name,
- last_line_index + 1, last_line));
- }
- } else {
- for line_info in lines {
- if let Some(line) = fm.get_line(line_info.line_index) {
- try!(write!(&mut self.dst, "{}:{} {}\n", fm.name,
- line_info.line_index + 1, line));
- }
- }
- }
- let last_line_start = format!("{}:{} ", fm.name, lines[lines.len()-1].line_index + 1);
- let hi = cm.lookup_char_pos(sp.hi);
- let skip = last_line_start.chars().count();
- let mut s = String::new();
- for _ in 0..skip {
- s.push(' ');
- }
- if let Some(orig) = fm.get_line(lines[0].line_index) {
- let iter = orig.chars().enumerate();
- for (pos, ch) in iter {
- // Span seems to use half-opened interval, so subtract 1
- if pos >= hi.col.to_usize() - 1 { break; }
- // Whenever a tab occurs on the previous line, we insert one on
- // the error-point-squiggly-line as well (instead of a space).
- // That way the squiggly line will usually appear in the correct
- // position.
- match ch {
- '\t' => s.push('\t'),
- _ => s.push(' '),
- }
- }
- }
- s.push('^');
- println_maybe_styled!(self, term::Attr::ForegroundColor(lvl.color()),
- "{}", s)
- }
-
- fn print_macro_backtrace(&mut self,
- cm: &codemap::CodeMap,
- sp: Span)
- -> io::Result<()> {
- let mut last_span = codemap::DUMMY_SP;
- let mut sp_opt = Some(sp);
-
- while let Some(sp) = sp_opt {
- sp_opt = try!(cm.with_expn_info(sp.expn_id, |expn_info| -> io::Result<_> {
- match expn_info {
- Some(ei) => {
- let (pre, post) = match ei.callee.format {
- codemap::MacroAttribute(..) => ("#[", "]"),
- codemap::MacroBang(..) => ("", "!"),
- };
- // Don't print recursive invocations
- if ei.call_site != last_span {
- last_span = ei.call_site;
-
- let mut diag_string = format!("in this expansion of {}{}{}",
- pre,
- ei.callee.name(),
- post);
-
- if let Some(def_site_span) = ei.callee.span {
- diag_string.push_str(&format!(" (defined in {})",
- cm.span_to_filename(def_site_span)));
- }
-
- try!(self.print_diagnostic(&cm.span_to_string(ei.call_site),
- Note,
- &diag_string,
- None));
- }
- Ok(Some(ei.call_site))
- }
- None => Ok(None)
- }
- }));
- }
-
- Ok(())
- }
-}
-
-#[cfg(unix)]
-fn stderr_isatty() -> bool {
- use libc;
- unsafe { libc::isatty(libc::STDERR_FILENO) != 0 }
-}
-#[cfg(windows)]
-fn stderr_isatty() -> bool {
- type DWORD = u32;
- type BOOL = i32;
- type HANDLE = *mut u8;
- const STD_ERROR_HANDLE: DWORD = -12i32 as DWORD;
- extern "system" {
- fn GetStdHandle(which: DWORD) -> HANDLE;
- fn GetConsoleMode(hConsoleHandle: HANDLE,
- lpMode: *mut DWORD) -> BOOL;
- }
- unsafe {
- let handle = GetStdHandle(STD_ERROR_HANDLE);
- let mut out = 0;
- GetConsoleMode(handle, &mut out) != 0
- }
-}
-
-impl Write for Destination {
- fn write(&mut self, bytes: &[u8]) -> io::Result<usize> {
- match *self {
- Terminal(ref mut t) => t.write(bytes),
- Raw(ref mut w) => w.write(bytes),
- }
- }
- fn flush(&mut self) -> io::Result<()> {
- match *self {
- Terminal(ref mut t) => t.flush(),
- Raw(ref mut w) => w.flush(),
- }
- }
-}
-
-impl Emitter for EmitterWriter {
- fn emit(&mut self,
- cmsp: Option<(&codemap::CodeMap, Span)>,
- msg: &str, code: Option<&str>, lvl: Level) {
- let error = match cmsp {
- Some((cm, COMMAND_LINE_SP)) => self.emit_(cm,
- FileLine(COMMAND_LINE_SP),
- msg, code, lvl),
- Some((cm, sp)) => self.emit_(cm, FullSpan(sp), msg, code, lvl),
- None => self.print_diagnostic("", lvl, msg, code),
- };
-
- match error {
- Ok(()) => {}
- Err(e) => panic!("failed to print diagnostics: {:?}", e),
- }
- }
-
- fn custom_emit(&mut self, cm: &codemap::CodeMap,
- sp: RenderSpan, msg: &str, lvl: Level) {
- match self.emit_(cm, sp, msg, None, lvl) {
- Ok(()) => {}
- Err(e) => panic!("failed to print diagnostics: {:?}", e),
- }
- }
-}
-
-pub fn expect<T, M>(diag: &SpanHandler, opt: Option<T>, msg: M) -> T where
- M: FnOnce() -> String,
-{
- match opt {
- Some(t) => t,
- None => diag.handler().bug(&msg()),
- }
-}
-
-#[cfg(test)]
-mod test {
- use super::{EmitterWriter, Level};
- use codemap::{mk_sp, CodeMap};
- use std::sync::{Arc, Mutex};
- use std::io::{self, Write};
- use std::str::from_utf8;
-
- // Diagnostic doesn't align properly in span where line number increases by one digit
- #[test]
- fn test_hilight_suggestion_issue_11715() {
- struct Sink(Arc<Mutex<Vec<u8>>>);
- impl Write for Sink {
- fn write(&mut self, data: &[u8]) -> io::Result<usize> {
- Write::write(&mut *self.0.lock().unwrap(), data)
- }
- fn flush(&mut self) -> io::Result<()> { Ok(()) }
- }
- let data = Arc::new(Mutex::new(Vec::new()));
- let mut ew = EmitterWriter::new(Box::new(Sink(data.clone())), None);
- let cm = CodeMap::new();
- let content = "abcdefg
- koksi
- line3
- line4
- cinq
- line6
- line7
- line8
- line9
- line10
- e-lä-vän
- tolv
- dreizehn
- ";
- let file = cm.new_filemap_and_lines("dummy.txt", content);
- let start = file.lines.borrow()[7];
- let end = file.lines.borrow()[11];
- let sp = mk_sp(start, end);
- let lvl = Level::Error;
- println!("span_to_lines");
- let lines = cm.span_to_lines(sp);
- println!("highlight_lines");
- ew.highlight_lines(&cm, sp, lvl, lines).unwrap();
- println!("done");
- let vec = data.lock().unwrap().clone();
- let vec: &[u8] = &vec;
- let str = from_utf8(vec).unwrap();
- println!("{}", str);
- assert_eq!(str, "dummy.txt: 8 line8\n\
- dummy.txt: 9 line9\n\
- dummy.txt:10 line10\n\
- dummy.txt:11 e-lä-vän\n\
- dummy.txt:12 tolv\n");
- }
-}
self.parse_sess.span_diagnostic.fileline_help(sp, msg);
}
pub fn bug(&self, msg: &str) -> ! {
- self.parse_sess.span_diagnostic.handler().bug(msg);
+ self.parse_sess.span_diagnostic.bug(msg);
}
pub fn trace_macros(&self) -> bool {
self.ecfg.trace_mac
let mut ret = expander.fold_crate(c);
ret.exported_macros = expander.cx.exported_macros.clone();
- cx.parse_sess.span_diagnostic.handler().abort_if_errors();
+ cx.parse_sess.span_diagnostic.abort_if_errors();
ret
};
return (ret, cx.syntax_env.names);
use ast;
use ast::{TokenTree, Ident, Name};
use codemap::{Span, DUMMY_SP};
-use diagnostic::SpanHandler;
+use errors::Handler;
use ext::tt::macro_parser::{NamedMatch, MatchedSeq, MatchedNonterminal};
use parse::token::{Eof, DocComment, Interpolated, MatchNt, SubstNt};
use parse::token::{Token, NtIdent, SpecialMacroVar};
#[derive(Clone)]
pub struct TtReader<'a> {
- pub sp_diag: &'a SpanHandler,
+ pub sp_diag: &'a Handler,
/// the unzipped tree:
stack: Vec<TtFrame>,
/* for MBE-style macro transcription */
/// This can do Macro-By-Example transcription. On the other hand, if
/// `src` contains no `TokenTree::Sequence`s, `MatchNt`s or `SubstNt`s, `interp` can
/// (and should) be None.
-pub fn new_tt_reader<'a>(sp_diag: &'a SpanHandler,
+pub fn new_tt_reader<'a>(sp_diag: &'a Handler,
interp: Option<HashMap<Name, Rc<NamedMatch>>>,
imported_from: Option<Ident>,
src: Vec<ast::TokenTree>)
/// This can do Macro-By-Example transcription. On the other hand, if
/// `src` contains no `TokenTree::Sequence`s, `MatchNt`s or `SubstNt`s, `interp` can
/// (and should) be None.
-pub fn new_tt_reader_with_doc_flag<'a>(sp_diag: &'a SpanHandler,
+pub fn new_tt_reader_with_doc_flag<'a>(sp_diag: &'a Handler,
interp: Option<HashMap<Name, Rc<NamedMatch>>>,
imported_from: Option<Ident>,
src: Vec<ast::TokenTree>,
use attr;
use attr::AttrMetaMethods;
use codemap::{CodeMap, Span};
-use diagnostic::SpanHandler;
+use errors::Handler;
use visit;
use visit::{FnKind, Visitor};
use parse::token::InternedString;
}
impl GatedCfgAttr {
- pub fn check_and_emit(&self, diagnostic: &SpanHandler, features: &Features) {
+ pub fn check_and_emit(&self, diagnostic: &Handler, features: &Features) {
match *self {
GatedCfgAttr::GatedCfg(ref cfg) => {
cfg.check_and_emit(diagnostic, features);
}
})
}
- fn check_and_emit(&self, diagnostic: &SpanHandler, features: &Features) {
+ fn check_and_emit(&self, diagnostic: &Handler, features: &Features) {
let (cfg, feature, has_feature) = GATED_CFGS[self.index];
if !has_feature(features) {
let explain = format!("`cfg({})` is experimental and subject to change", cfg);
const EXPLAIN_STMT_ATTR_SYNTAX: &'static str =
"attributes on non-item statements and expressions are experimental.";
-pub fn check_for_box_syntax(f: Option<&Features>, diag: &SpanHandler, span: Span) {
+pub fn check_for_box_syntax(f: Option<&Features>, diag: &Handler, span: Span) {
if let Some(&Features { allow_box: true, .. }) = f {
return;
}
emit_feature_err(diag, "box_syntax", span, GateIssue::Language, EXPLAIN_BOX_SYNTAX);
}
-pub fn check_for_placement_in(f: Option<&Features>, diag: &SpanHandler, span: Span) {
+pub fn check_for_placement_in(f: Option<&Features>, diag: &Handler, span: Span) {
if let Some(&Features { allow_placement_in: true, .. }) = f {
return;
}
emit_feature_err(diag, "placement_in_syntax", span, GateIssue::Language, EXPLAIN_PLACEMENT_IN);
}
-pub fn check_for_pushpop_syntax(f: Option<&Features>, diag: &SpanHandler, span: Span) {
+pub fn check_for_pushpop_syntax(f: Option<&Features>, diag: &Handler, span: Span) {
if let Some(&Features { allow_pushpop_unsafe: true, .. }) = f {
return;
}
struct Context<'a> {
features: Vec<&'static str>,
- span_handler: &'a SpanHandler,
+ span_handler: &'a Handler,
cm: &'a CodeMap,
plugin_attributes: &'a [(String, AttributeType)],
}
Library(Option<u32>)
}
-pub fn emit_feature_err(diag: &SpanHandler, feature: &str, span: Span, issue: GateIssue,
+pub fn emit_feature_err(diag: &Handler, feature: &str, span: Span, issue: GateIssue,
explain: &str) {
let issue = match issue {
GateIssue::Language => find_lang_feature_issue(feature),
}
}
-fn check_crate_inner<F>(cm: &CodeMap, span_handler: &SpanHandler,
+fn check_crate_inner<F>(cm: &CodeMap, span_handler: &Handler,
krate: &ast::Crate,
plugin_attributes: &[(String, AttributeType)],
check: F)
}
}
-pub fn check_crate_macros(cm: &CodeMap, span_handler: &SpanHandler, krate: &ast::Crate)
+pub fn check_crate_macros(cm: &CodeMap, span_handler: &Handler, krate: &ast::Crate)
-> Features {
check_crate_inner(cm, span_handler, krate, &[] as &'static [_],
|ctx, krate| visit::walk_crate(&mut MacroVisitor { context: ctx }, krate))
}
-pub fn check_crate(cm: &CodeMap, span_handler: &SpanHandler, krate: &ast::Crate,
+pub fn check_crate(cm: &CodeMap, span_handler: &Handler, krate: &ast::Crate,
plugin_attributes: &[(String, AttributeType)],
unstable: UnstableFeatures) -> Features
{
Cheat
}
-fn maybe_stage_features(span_handler: &SpanHandler, krate: &ast::Crate,
+fn maybe_stage_features(span_handler: &Handler, krate: &ast::Crate,
unstable: UnstableFeatures) {
let allow_features = match unstable {
UnstableFeatures::Allow => true,
macro_rules! panictry {
($e:expr) => ({
use std::result::Result::{Ok, Err};
- use diagnostic::FatalError;
+ use errors::FatalError;
match $e {
Ok(e) => e,
Err(FatalError) => panic!(FatalError)
pub mod metadata;
}
+pub mod errors;
+
pub mod syntax {
pub use ext;
pub use parse;
pub mod attr;
pub mod codemap;
pub mod config;
-pub mod diagnostic;
pub mod entry;
pub mod feature_gate;
pub mod fold;
use ast;
use codemap::{BytePos, CharPos, CodeMap, Pos};
-use diagnostic;
+use errors;
use parse::lexer::is_block_doc_comment;
use parse::lexer::{StringReader, TokenAndSpan};
use parse::lexer::{is_whitespace, Reader};
// it appears this function is called only from pprust... that's
// probably not a good thing.
-pub fn gather_comments_and_literals(span_diagnostic: &diagnostic::SpanHandler,
+pub fn gather_comments_and_literals(span_diagnostic: &errors::Handler,
path: String,
srdr: &mut Read)
-> (Vec<Comment>, Vec<Literal>) {
use ast;
use codemap::{BytePos, CharPos, CodeMap, Pos, Span};
use codemap;
-use diagnostic::FatalError;
-use diagnostic::SpanHandler;
+use errors::{FatalError, Handler};
use ext::tt::transcribe::tt_next_token;
use parse::token::str_to_ident;
use parse::token;
}
pub struct StringReader<'a> {
- pub span_diagnostic: &'a SpanHandler,
+ pub span_diagnostic: &'a Handler,
/// The absolute offset within the codemap of the next character to read
pub pos: BytePos,
/// The absolute offset within the codemap of the last character read(curr)
impl<'a> StringReader<'a> {
/// For comments.rs, which hackily pokes into pos and curr
- pub fn new_raw<'b>(span_diagnostic: &'b SpanHandler,
+ pub fn new_raw<'b>(span_diagnostic: &'b Handler,
filemap: Rc<codemap::FileMap>) -> StringReader<'b> {
if filemap.src.is_none() {
- span_diagnostic.handler.bug(&format!("Cannot lex filemap without source: {}",
+ span_diagnostic.bug(&format!("Cannot lex filemap without source: {}",
filemap.name)[..]);
}
sr
}
- pub fn new<'b>(span_diagnostic: &'b SpanHandler,
+ pub fn new<'b>(span_diagnostic: &'b Handler,
filemap: Rc<codemap::FileMap>) -> StringReader<'b> {
let mut sr = StringReader::new_raw(span_diagnostic, filemap);
sr.advance_token();
use parse::token::{str_to_ident};
use std::io;
- fn mk_sh() -> diagnostic::SpanHandler {
+ fn mk_sh() -> diagnostic::Handler {
// FIXME (#22405): Replace `Box::new` with `box` here when/if possible.
let emitter = diagnostic::EmitterWriter::new(Box::new(io::sink()), None);
let handler = diagnostic::Handler::with_emitter(true, Box::new(emitter));
- diagnostic::SpanHandler::new(handler, CodeMap::new())
+ diagnostic::Handler::new(handler, CodeMap::new())
}
// open a string reader for the given string
- fn setup<'a>(span_handler: &'a diagnostic::SpanHandler,
+ fn setup<'a>(span_handler: &'a diagnostic::Handler,
teststr: String) -> StringReader<'a> {
let fm = span_handler.cm.new_filemap("zebra.rs".to_string(), teststr);
StringReader::new(span_handler, fm)
use ast;
use codemap::{self, Span, CodeMap, FileMap};
-use diagnostic::{SpanHandler, Handler, Auto, FatalError};
+use errors::{Handler, ColorConfig, FatalError};
use parse::parser::Parser;
use parse::token::InternedString;
use ptr::P;
/// Info about a parsing session.
pub struct ParseSess {
- pub span_diagnostic: SpanHandler, // better be the same as the one in the reader!
+ pub span_diagnostic: Handler, // better be the same as the one in the reader!
/// Used to determine and report recursive mod inclusions
included_mod_stack: RefCell<Vec<PathBuf>>,
+ code_map: Rc<CodeMap>,
}
impl ParseSess {
pub fn new() -> ParseSess {
- let handler = SpanHandler::new(Handler::new(Auto, None, true), CodeMap::new());
- ParseSess::with_span_handler(handler)
+ let cm = Rc::new(CodeMap::new());
+ let handler = Handler::new(ColorConfig::Auto, None, true, cm.clone());
+ ParseSess::with_span_handler(handler, cm)
}
- pub fn with_span_handler(sh: SpanHandler) -> ParseSess {
+ pub fn with_span_handler(handler: Handler, code_map: Rc<CodeMap>) -> ParseSess {
ParseSess {
- span_diagnostic: sh,
- included_mod_stack: RefCell::new(vec![])
+ span_diagnostic: handler,
+ included_mod_stack: RefCell::new(vec![]),
+ code_map: code_map
}
}
pub fn codemap(&self) -> &CodeMap {
- &self.span_diagnostic.cm
+ &self.code_map
}
}
let msg = format!("couldn't read {:?}: {}", path.display(), e);
match spanopt {
Some(sp) => panic!(sess.span_diagnostic.span_fatal(sp, &msg)),
- None => panic!(sess.span_diagnostic.handler().fatal(&msg))
+ None => panic!(sess.span_diagnostic.fatal(&msg))
}
}
}
}
fn filtered_float_lit(data: token::InternedString, suffix: Option<&str>,
- sd: &SpanHandler, sp: Span) -> ast::Lit_ {
+ sd: &Handler, sp: Span) -> ast::Lit_ {
debug!("filtered_float_lit: {}, {:?}", data, suffix);
match suffix.as_ref().map(|s| &**s) {
Some("f32") => ast::LitFloat(data, ast::TyF32),
}
}
pub fn float_lit(s: &str, suffix: Option<InternedString>,
- sd: &SpanHandler, sp: Span) -> ast::Lit_ {
+ sd: &Handler, sp: Span) -> ast::Lit_ {
debug!("float_lit: {:?}, {:?}", s, suffix);
// FIXME #2252: bounds checking float literals is deferred until trans
let s = s.chars().filter(|&c| c != '_').collect::<String>();
pub fn integer_lit(s: &str,
suffix: Option<InternedString>,
- sd: &SpanHandler,
+ sd: &Handler,
sp: Span)
-> ast::Lit_ {
// s can only be ascii, byte indexing is fine
}
if !self.obsolete_set.contains(&kind) &&
- (error || self.sess.span_diagnostic.handler().can_emit_warnings) {
+ (error || self.sess.span_diagnostic.can_emit_warnings) {
self.sess
.span_diagnostic
- .handler()
.note(&format!("{}", desc));
self.obsolete_set.insert(kind);
}
use ast;
use ast_util::{self, ident_to_path};
use codemap::{self, Span, BytePos, Spanned, spanned, mk_sp, CodeMap};
-use diagnostic;
+use errors::{self, FatalError};
use ext::tt::macro_parser;
use parse;
use parse::classify;
use ptr::P;
use owned_slice::OwnedSlice;
use parse::PResult;
-use diagnostic::FatalError;
use std::collections::HashSet;
use std::io::prelude::*;
}
f(&self.buffer[((self.buffer_start + dist - 1) & 3) as usize].tok)
}
- pub fn fatal(&self, m: &str) -> diagnostic::FatalError {
+ pub fn fatal(&self, m: &str) -> errors::FatalError {
self.sess.span_diagnostic.span_fatal(self.span, m)
}
- pub fn span_fatal(&self, sp: Span, m: &str) -> diagnostic::FatalError {
+ pub fn span_fatal(&self, sp: Span, m: &str) -> errors::FatalError {
self.sess.span_diagnostic.span_fatal(sp, m)
}
- pub fn span_fatal_help(&self, sp: Span, m: &str, help: &str) -> diagnostic::FatalError {
+ pub fn span_fatal_help(&self, sp: Span, m: &str, help: &str) -> errors::FatalError {
self.span_err(sp, m);
self.fileline_help(sp, help);
- diagnostic::FatalError
+ errors::FatalError
}
pub fn span_note(&self, sp: Span, m: &str) {
self.sess.span_diagnostic.span_note(sp, m)
self.sess.span_diagnostic.span_bug(sp, m)
}
pub fn abort_if_errors(&self) {
- self.sess.span_diagnostic.handler().abort_if_errors();
+ self.sess.span_diagnostic.abort_if_errors();
}
pub fn id_to_interned_str(&mut self, id: Ident) -> InternedString {
use owned_slice::OwnedSlice;
use attr::{AttrMetaMethods, AttributeMethods};
use codemap::{self, CodeMap, BytePos};
-use diagnostic;
+use errors;
use parse::token::{self, BinOpToken, Token, InternedString};
use parse::lexer::comments;
use parse;
/// it can scan the input text for comments and literals to
/// copy forward.
pub fn print_crate<'a>(cm: &'a CodeMap,
- span_diagnostic: &diagnostic::SpanHandler,
+ span_diagnostic: &errors::Handler,
krate: &ast::Crate,
filename: String,
input: &mut Read,
impl<'a> State<'a> {
pub fn new_from_input(cm: &'a CodeMap,
- span_diagnostic: &diagnostic::SpanHandler,
+ span_diagnostic: &errors::Handler,
filename: String,
input: &mut Read,
out: Box<Write+'a>,
use std::str::FromStr;
use ast;
-use diagnostic;
+use errors;
use visit;
use visit::Visitor;
}
struct ShowSpanVisitor<'a> {
- span_diagnostic: &'a diagnostic::SpanHandler,
+ span_diagnostic: &'a errors::Handler,
mode: Mode,
}
}
}
-pub fn run(span_diagnostic: &diagnostic::SpanHandler,
+pub fn run(span_diagnostic: &errors::Handler,
mode: &str,
krate: &ast::Crate) {
let mode = match mode.parse().ok() {
use attr;
use codemap::{DUMMY_SP, Span, ExpnInfo, NameAndSpan, MacroAttribute};
use codemap;
-use diagnostic;
+use errors;
use config;
use entry::{self, EntryPointType};
use ext::base::ExtCtxt;
struct TestCtxt<'a> {
sess: &'a ParseSess,
- span_diagnostic: &'a diagnostic::SpanHandler,
+ span_diagnostic: &'a errors::Handler,
path: Vec<ast::Ident>,
ext_cx: ExtCtxt<'a>,
testfns: Vec<Test>,
pub fn modify_for_testing(sess: &ParseSess,
cfg: &ast::CrateConfig,
krate: ast::Crate,
- span_diagnostic: &diagnostic::SpanHandler) -> ast::Crate {
+ span_diagnostic: &errors::Handler) -> ast::Crate {
// We generate the test harness when building in the 'test'
// configuration, either with the '--test' or '--cfg test'
// command line options.
reexport_test_harness_main: Option<InternedString>,
krate: ast::Crate,
cfg: &ast::CrateConfig,
- sd: &diagnostic::SpanHandler) -> ast::Crate {
+ sd: &errors::Handler) -> ast::Crate {
// Remove the entry points
let mut cleaner = EntryPointCleaner { depth: 0 };
let krate = cleaner.fold_crate(krate);
return res;
}
-fn strip_test_functions(diagnostic: &diagnostic::SpanHandler, krate: ast::Crate)
+fn strip_test_functions(diagnostic: &errors::Handler, krate: ast::Crate)
-> ast::Crate {
// When not compiling with --test we should not compile the
// #[test] functions
Some(id) => vec![id],
None => {
let diag = cx.span_diagnostic;
- diag.handler.bug("expected to find top-level re-export name, but found None");
+ diag.bug("expected to find top-level re-export name, but found None");
}
};
visible_path.extend(path);
use syntax::ext::build::AstBuilder;
use syntax::codemap::{self, DUMMY_SP};
use syntax::codemap::Span;
-use syntax::diagnostic::SpanHandler;
+use syntax::errors::Handler;
use syntax::util::move_map::MoveMap;
use syntax::owned_slice::OwnedSlice;
use syntax::parse::token::{intern, InternedString};
}
}
-fn find_repr_type_name(diagnostic: &SpanHandler,
+fn find_repr_type_name(diagnostic: &Handler,
type_attrs: &[ast::Attribute]) -> &'static str {
let mut repr_type_name = "i32";
for a in type_attrs {
projects / rust.git / commitdiff