Skip to content

Commit fe896ef

Browse files
borsbors
committed
Auto merge of rust-lang#114104 - oli-obk:syn2, r=compiler-errors
Lots of tiny incremental simplifications of `EmitterWriter` internals ignore the first commit, it's rust-lang#114088 squashed and rebased, but it's needed to use to use `derive_setters`, as they need a newer `syn` version. Then this PR starts out with removing many arguments that are almost always defaulted to `None` or `false` and replace them with builder methods that can set these fields in the few cases that want to set them. After that it's one commit after the other that removes or merges things until everything becomes some very simple trait objects
2 parents 03181e0 + 375d8f1 commit fe896ef

File tree

14 files changed

+214
-317
lines changed

14 files changed

+214
-317
lines changed

‎Cargo.lock

+55
Original file line numberDiff line numberDiff line change
@@ -830,6 +830,41 @@ dependencies = [
830830
"winapi",
831831
]
832832

833+
[[package]]
834+
name = "darling"
835+
version = "0.20.3"
836+
source = "registry+https://github.com/rust-lang/crates.io-index"
837+
checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
838+
dependencies = [
839+
"darling_core",
840+
"darling_macro",
841+
]
842+
843+
[[package]]
844+
name = "darling_core"
845+
version = "0.20.3"
846+
source = "registry+https://github.com/rust-lang/crates.io-index"
847+
checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
848+
dependencies = [
849+
"fnv",
850+
"ident_case",
851+
"proc-macro2",
852+
"quote",
853+
"strsim",
854+
"syn 2.0.27",
855+
]
856+
857+
[[package]]
858+
name = "darling_macro"
859+
version = "0.20.3"
860+
source = "registry+https://github.com/rust-lang/crates.io-index"
861+
checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
862+
dependencies = [
863+
"darling_core",
864+
"quote",
865+
"syn 2.0.27",
866+
]
867+
833868
[[package]]
834869
name = "datafrog"
835870
version = "2.0.1"
@@ -869,6 +904,18 @@ dependencies = [
869904
"syn 1.0.109",
870905
]
871906

907+
[[package]]
908+
name = "derive_setters"
909+
version = "0.1.6"
910+
source = "registry+https://github.com/rust-lang/crates.io-index"
911+
checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d"
912+
dependencies = [
913+
"darling",
914+
"proc-macro2",
915+
"quote",
916+
"syn 2.0.27",
917+
]
918+
872919
[[package]]
873920
name = "diff"
874921
version = "0.1.13"
@@ -1740,6 +1787,12 @@ dependencies = [
17401787
"syn 1.0.109",
17411788
]
17421789

1790+
[[package]]
1791+
name = "ident_case"
1792+
version = "1.0.1"
1793+
source = "registry+https://github.com/rust-lang/crates.io-index"
1794+
checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
1795+
17431796
[[package]]
17441797
name = "idna"
17451798
version = "0.4.0"
@@ -3524,6 +3577,7 @@ name = "rustc_errors"
35243577
version = "0.0.0"
35253578
dependencies = [
35263579
"annotate-snippets",
3580+
"derive_setters",
35273581
"rustc_ast",
35283582
"rustc_ast_pretty",
35293583
"rustc_data_structures",
@@ -3566,6 +3620,7 @@ dependencies = [
35663620
"rustc_session",
35673621
"rustc_span",
35683622
"smallvec",
3623+
"termcolor",
35693624
"thin-vec",
35703625
"tracing",
35713626
]

‎compiler/rustc_driver_impl/src/lib.rs

+1-11
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ use rustc_data_structures::profiling::{
2727
use rustc_data_structures::sync::SeqCst;
2828
use rustc_errors::registry::{InvalidErrorCode, Registry};
2929
use rustc_errors::{markdown, ColorConfig};
30-
use rustc_errors::{
31-
DiagnosticMessage, ErrorGuaranteed, Handler, PResult, SubdiagnosticMessage, TerminalUrl,
32-
};
30+
use rustc_errors::{DiagnosticMessage, ErrorGuaranteed, Handler, PResult, SubdiagnosticMessage};
3331
use rustc_feature::find_gated_cfg;
3432
use rustc_fluent_macro::fluent_messages;
3533
use rustc_interface::util::{self, collect_crate_types, get_codegen_backend};
@@ -1405,15 +1403,7 @@ pub fn report_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str, extra_info:
14051403
rustc_errors::fallback_fluent_bundle(crate::DEFAULT_LOCALE_RESOURCES.to_vec(), false);
14061404
let emitter = Box::new(rustc_errors::emitter::EmitterWriter::stderr(
14071405
rustc_errors::ColorConfig::Auto,
1408-
None,
1409-
None,
14101406
fallback_bundle,
1411-
false,
1412-
false,
1413-
None,
1414-
false,
1415-
false,
1416-
TerminalUrl::No,
14171407
));
14181408
let handler = rustc_errors::Handler::with_emitter(emitter);
14191409

‎compiler/rustc_errors/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ annotate-snippets = "0.9"
2525
termize = "0.1.1"
2626
serde = { version = "1.0.125", features = [ "derive" ] }
2727
serde_json = "1.0.59"
28+
derive_setters = "0.1.6"
2829

2930
[target.'cfg(windows)'.dependencies.windows]
3031
version = "0.48.0"

0 commit comments

Comments
 (0)