Skip to content

Lots of tiny incremental simplifications of EmitterWriter internals #114104

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 11 commits into from
Aug 4, 2023
Merged

Lots of tiny incremental simplifications of EmitterWriter internals #114104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
29de70d
Replace the many arguments of `EmitterWriter::stderr` with builder me…
oli-obk Jul 25, 2023
0e7ec96
Use builder pattern instead of lots of arguments for `EmitterWriter::…
oli-obk Jul 25, 2023
51c2215
Remove a `bool` for color in favor of the `WriteColor` trait wrapping…
oli-obk Jul 26, 2023
339890e
Remove an enum variant that can be covered by another
oli-obk Jul 26, 2023
0007469
Merge buffered destination into raw destination
oli-obk Jul 26, 2023
1e2167f
Move `WritableDst` method onto `Style` directly
oli-obk Jul 26, 2023
826a8ef
Remove a now-redundant single-variant enum
oli-obk Jul 26, 2023
10da30f
Merge all `Destination` variants
oli-obk Jul 26, 2023
2131eee
Turn a single-variant enum into a struct
oli-obk Jul 26, 2023
d9deaf4
Get rid of the thin wrapper type that is `Destination` and just write…
oli-obk Jul 26, 2023
375d8f1
Sanity check that we actually flush all buffers
oli-obk Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,41 @@ dependencies = [
"winapi",
]

[[package]]
name = "darling"
version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
dependencies = [
"darling_core",
"darling_macro",
]

[[package]]
name = "darling_core"
version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim",
"syn 2.0.27",
]

[[package]]
name = "darling_macro"
version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [
"darling_core",
"quote",
"syn 2.0.27",
]

[[package]]
name = "datafrog"
version = "2.0.1"
Expand Down Expand Up @@ -869,6 +904,18 @@ dependencies = [
"syn 1.0.109",
]

[[package]]
name = "derive_setters"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d"
dependencies = [
"darling",
"proc-macro2",
"quote",
"syn 2.0.27",
]

[[package]]
name = "diff"
version = "0.1.13"
Expand Down Expand Up @@ -1740,6 +1787,12 @@ dependencies = [
"syn 1.0.109",
]

[[package]]
name = "ident_case"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"

[[package]]
name = "idna"
version = "0.4.0"
Expand Down Expand Up @@ -3523,6 +3576,7 @@ name = "rustc_errors"
version = "0.0.0"
dependencies = [
"annotate-snippets",
"derive_setters",
"rustc_ast",
"rustc_ast_pretty",
"rustc_data_structures",
Expand Down Expand Up @@ -3565,6 +3619,7 @@ dependencies = [
"rustc_session",
"rustc_span",
"smallvec",
"termcolor",
"thin-vec",
"tracing",
]
Expand Down
12 changes: 1 addition & 11 deletions compiler/rustc_driver_impl/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ use rustc_data_structures::profiling::{
use rustc_data_structures::sync::SeqCst;
use rustc_errors::registry::{InvalidErrorCode, Registry};
use rustc_errors::{markdown, ColorConfig};
use rustc_errors::{
DiagnosticMessage, ErrorGuaranteed, Handler, PResult, SubdiagnosticMessage, TerminalUrl,
};
use rustc_errors::{DiagnosticMessage, ErrorGuaranteed, Handler, PResult, SubdiagnosticMessage};
use rustc_feature::find_gated_cfg;
use rustc_fluent_macro::fluent_messages;
use rustc_interface::util::{self, collect_crate_types, get_codegen_backend};
Expand Down Expand Up @@ -1405,15 +1403,7 @@ pub fn report_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str, extra_info:
rustc_errors::fallback_fluent_bundle(crate::DEFAULT_LOCALE_RESOURCES.to_vec(), false);
let emitter = Box::new(rustc_errors::emitter::EmitterWriter::stderr(
rustc_errors::ColorConfig::Auto,
None,
None,
fallback_bundle,
false,
false,
None,
false,
false,
TerminalUrl::No,
));
let handler = rustc_errors::Handler::with_emitter(emitter);

Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_errors/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ annotate-snippets = "0.9"
termize = "0.1.1"
serde = { version = "1.0.125", features = [ "derive" ] }
serde_json = "1.0.59"
derive_setters = "0.1.6"

[target.'cfg(windows)'.dependencies.windows]
version = "0.48.0"
Expand Down
Loading