Skip to content

Commit d1da86e

Browse files
authored
Unrolled build for #150880
Rollup merge of #150880 - bjorn3:remove_old_error_emitter, r=nnethercote Remove old error emitter This completes the transition to annotate-snippets and cuts 3600 lines of code.
2 parents 625b63f + 3ccabc6 commit d1da86e

File tree

13 files changed

+53
-3606
lines changed

13 files changed

+53
-3606
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3865,7 +3865,6 @@ dependencies = [
38653865
"rustc_fluent_macro",
38663866
"rustc_hashes",
38673867
"rustc_index",
3868-
"rustc_lexer",
38693868
"rustc_lint_defs",
38703869
"rustc_macros",
38713870
"rustc_serialize",

compiler/rustc_driver_impl/src/lib.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,10 +1534,11 @@ fn report_ice(
15341534
using_internal_features: &AtomicBool,
15351535
) {
15361536
let translator = default_translator();
1537-
let emitter = Box::new(rustc_errors::emitter::HumanEmitter::new(
1538-
stderr_destination(rustc_errors::ColorConfig::Auto),
1539-
translator,
1540-
));
1537+
let emitter =
1538+
Box::new(rustc_errors::annotate_snippet_emitter_writer::AnnotateSnippetEmitter::new(
1539+
stderr_destination(rustc_errors::ColorConfig::Auto),
1540+
translator,
1541+
));
15411542
let dcx = rustc_errors::DiagCtxt::new(emitter);
15421543
let dcx = dcx.handle();
15431544

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)