bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make JsonEmitter more like HumanEmitter.

Browse source 
Use `derive(Setters)` to derive setters, and then change
`JsonEmitter::new` to only have the arguments that are always used.
This commit is contained in:
Nicholas Nethercote 2024-02-29 16:03:59 +11:00
parent 2999d8dc72
commit 9ff4487999
5 changed files with 32 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/rustc_session/src/session.rs
View file

@ -1001,21 +1001,21 @@ fn default_emitter(
config::ErrorOutputType::Json { pretty, json_rendered } => Box::new(
JsonEmitter::new(
Box::new(io::BufWriter::new(io::stderr())),
Some(registry),
source_map,
bundle,
fallback_bundle,
pretty,
json_rendered,
sopts.diagnostic_width,
macro_backtrace,
track_diagnostics,
terminal_url,
)
.registry(Some(registry))
.fluent_bundle(bundle)
.ui_testing(sopts.unstable_opts.ui_testing)
.ignored_directories_in_source_blocks(
sopts.unstable_opts.ignore_directory_in_diagnostics_source_blocks.clone(),
),
)
.diagnostic_width(sopts.diagnostic_width)
.macro_backtrace(macro_backtrace)
.track_diagnostics(track_diagnostics)
.terminal_url(terminal_url),
),
}
}
@ -1482,16 +1482,10 @@ fn mk_emitter(output: ErrorOutputType) -> Box<DynEmitter> {
}
config::ErrorOutputType::Json { pretty, json_rendered } => Box::new(JsonEmitter::new(
Box::new(io::BufWriter::new(io::stderr())),
None,
Lrc::new(SourceMap::new(FilePathMapping::empty())),
None,
fallback_bundle,
pretty,
json_rendered,
None,
false,
false,
TerminalUrl::No,
)),
};
emitter