Skip to content

Commit 1b27206

Browse files
committed
Remove old error emitter
This completes the transition to annotate-snippets
1 parent 85d0cdf commit 1b27206

12 files changed

Lines changed: 50 additions & 3604 deletions

File tree

Cargo.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3901,7 +3901,6 @@ dependencies = [
39013901
"rustc_fluent_macro",
39023902
"rustc_hashes",
39033903
"rustc_index",
3904-
"rustc_lexer",
39053904
"rustc_lint_defs",
39063905
"rustc_macros",
39073906
"rustc_serialize",

compiler/rustc_driver_impl/src/lib.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,10 +1481,11 @@ fn report_ice(
14811481
using_internal_features: &AtomicBool,
14821482
) {
14831483
let translator = default_translator();
1484-
let emitter = Box::new(rustc_errors::emitter::HumanEmitter::new(
1485-
stderr_destination(rustc_errors::ColorConfig::Auto),
1486-
translator,
1487-
));
1484+
let emitter =
1485+
Box::new(rustc_errors::annotate_snippet_emitter_writer::AnnotateSnippetEmitter::new(
1486+
stderr_destination(rustc_errors::ColorConfig::Auto),
1487+
translator,
1488+
));
14881489
let dcx = rustc_errors::DiagCtxt::new(emitter);
14891490
let dcx = dcx.handle();
14901491

compiler/rustc_errors/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ rustc_error_messages = { path = "../rustc_error_messages" }
1717
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
1818
rustc_hashes = { path = "../rustc_hashes" }
1919
rustc_index = { path = "../rustc_index" }
20-
rustc_lexer = { path = "../rustc_lexer" }
2120
rustc_lint_defs = { path = "../rustc_lint_defs" }
2221
rustc_macros = { path = "../rustc_macros" }
2322
rustc_serialize = { path = "../rustc_serialize" }

compiler/rustc_errors/src/diagnostic.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ use rustc_span::source_map::Spanned;
1515
use rustc_span::{DUMMY_SP, Span, Symbol};
1616
use tracing::debug;
1717

18-
use crate::snippet::Style;
1918
use crate::{
2019
CodeSuggestion, DiagCtxtHandle, DiagMessage, ErrCode, ErrorGuaranteed, ExplicitBug, Level,
21-
MultiSpan, StashKey, SubdiagMessage, Substitution, SubstitutionPart, SuggestionStyle,
20+
MultiSpan, StashKey, Style, SubdiagMessage, Substitution, SubstitutionPart, SuggestionStyle,
2221
Suggestions,
2322
};
2423

0 commit comments

Comments
 (0)