mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename colorful-json to json-rendered and make it a selection instead of a bool

Browse Source
This commit is contained in:
Oliver Scherer 2019-03-25 11:16:58 +01:00
parent 0a842e8c7a
commit 39b21376db
8 changed files with 164 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/librustc/session/config.rs
View File

@ -19,6 +19,7 @@
use syntax::parse; use syntax::parse;
use syntax::symbol::Symbol; use syntax::symbol::Symbol;
use syntax::feature_gate::UnstableFeatures; use syntax::feature_gate::UnstableFeatures;
use errors::emitter::HumanReadableErrorType;
use errors::{ColorConfig, FatalError, Handler}; use errors::{ColorConfig, FatalError, Handler};
@ -204,19 +205,18 @@ pub fn extension(&self) -> &'static str {
#[derive(Clone, Copy, Debug, PartialEq, Eq)] #[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum ErrorOutputType { pub enum ErrorOutputType {
HumanReadable(ColorConfig), HumanReadable(HumanReadableErrorType),
Json { Json {
/// Render the json in a human readable way (with indents and newlines) /// Render the json in a human readable way (with indents and newlines)
pretty: bool, pretty: bool,
/// The `rendered` field with the command line diagnostics include color codes /// The way the `rendered` field is created
colorful_rendered: bool, json_rendered: HumanReadableErrorType,
}, },
Short(ColorConfig),
} }
impl Default for ErrorOutputType { impl Default for ErrorOutputType {
fn default() -> ErrorOutputType { fn default() -> ErrorOutputType {
ErrorOutputType::HumanReadable(ColorConfig::Auto) ErrorOutputType::HumanReadable(HumanReadableErrorType::Default(ColorConfig::Auto))
} }
} }
@ -1350,8 +1350,8 @@ fn parse_merge_functions(slot: &mut Option<MergeFunctions>, v: Option<&str>) ->
"print some statistics about AST and HIR"), "print some statistics about AST and HIR"),
always_encode_mir: bool = (false, parse_bool, [TRACKED], always_encode_mir: bool = (false, parse_bool, [TRACKED],
"encode MIR of all functions into the crate metadata"), "encode MIR of all functions into the crate metadata"),
colorful_json: bool = (false, parse_bool, [UNTRACKED], json_rendered: Option<String> = (None, parse_opt_string, [UNTRACKED],
"encode color codes in the `rendered` field of json diagnostics"), "describes how to render the `rendered` field of json diagnostics"),
unleash_the_miri_inside_of_you: bool = (false, parse_bool, [TRACKED], unleash_the_miri_inside_of_you: bool = (false, parse_bool, [TRACKED],
"take the breaks off const evaluation. NOTE: this is unsound"), "take the breaks off const evaluation. NOTE: this is unsound"),
osx_rpath_install_name: bool = (false, parse_bool, [TRACKED], osx_rpath_install_name: bool = (false, parse_bool, [TRACKED],
@ -1807,9 +1807,9 @@ pub fn rustc_optgroups() -> Vec<RustcOptGroup> {
), ),
opt::opt( opt::opt(
"", "",
"colorful-json", "json-rendered",
"Emit ansi color codes to the `rendered` field of json diagnostics", "Choose `rendered` field of json diagnostics render scheme",
"TYPE", "plain|termcolor",
), ),
opt::opt_s( opt::opt_s(
"", "",
@ -1951,7 +1951,17 @@ pub fn build_session_options_and_crate_config(
) )
} }
let colorful_rendered = matches.opt_present("colorful-json"); let json_rendered = matches.opt_str("json-rendered").and_then(|s| match s.as_str() {
"plain" => None,
"termcolor" => Some(HumanReadableErrorType::Default(ColorConfig::Always)),
_ => early_error(
ErrorOutputType::default(),
&format!(
"argument for --json-rendered must be `plain` or `termcolor` (instead was `{}`)",
s,
),
),
}).unwrap_or(HumanReadableErrorType::Default(ColorConfig::Never));
// We need the opts_present check because the driver will send us Matches // We need the opts_present check because the driver will send us Matches
// with only stable options if no unstable options are used. Since error-format // with only stable options if no unstable options are used. Since error-format
@ -1959,14 +1969,14 @@ pub fn build_session_options_and_crate_config(
// opt_present because the latter will panic. // opt_present because the latter will panic.
let error_format = if matches.opts_present(&["error-format".to_owned()]) { let error_format = if matches.opts_present(&["error-format".to_owned()]) {
match matches.opt_str("error-format").as_ref().map(|s| &s[..]) { match matches.opt_str("error-format").as_ref().map(|s| &s[..]) {
Some("human") => ErrorOutputType::HumanReadable(color), None |
Some("json") => ErrorOutputType::Json { pretty: false, colorful_rendered }, Some("human") => ErrorOutputType::HumanReadable(HumanReadableErrorType::Default(color)),
Some("pretty-json") => ErrorOutputType::Json { pretty: true, colorful_rendered }, Some("json") => ErrorOutputType::Json { pretty: false, json_rendered },
Some("short") => ErrorOutputType::Short(color), Some("pretty-json") => ErrorOutputType::Json { pretty: true, json_rendered },
None => ErrorOutputType::HumanReadable(color), Some("short") => ErrorOutputType::HumanReadable(HumanReadableErrorType::Short(color)),
Some(arg) => early_error( Some(arg) => early_error(
ErrorOutputType::HumanReadable(color), ErrorOutputType::HumanReadable(HumanReadableErrorType::Default(color)),
&format!( &format!(
"argument for --error-format must be `human`, `json` or \ "argument for --error-format must be `human`, `json` or \
`short` (instead was `{}`)", `short` (instead was `{}`)",
@ -1975,7 +1985,7 @@ pub fn build_session_options_and_crate_config(
), ),
} }
} else { } else {
ErrorOutputType::HumanReadable(color) ErrorOutputType::HumanReadable(HumanReadableErrorType::Default(color))
}; };
let unparsed_crate_types = matches.opt_strs("crate-type"); let unparsed_crate_types = matches.opt_strs("crate-type");
@ -1988,12 +1998,12 @@ pub fn build_session_options_and_crate_config(
let mut debugging_opts = build_debugging_options(matches, error_format); let mut debugging_opts = build_debugging_options(matches, error_format);
if !debugging_opts.unstable_options { if !debugging_opts.unstable_options {
if colorful_rendered { if matches.opt_str("json-rendered").is_some() {
early_error(error_format, "--colorful-json=true is unstable"); early_error(error_format, "`--json-rendered=x` is unstable");
} }
if let ErrorOutputType::Json { pretty: true, .. } = error_format { if let ErrorOutputType::Json { pretty: true, json_rendered } = error_format {
early_error( early_error(
ErrorOutputType::Json { pretty: false, colorful_rendered: false }, ErrorOutputType::Json { pretty: false, json_rendered },
"--error-format=pretty-json is unstable", "--error-format=pretty-json is unstable",
); );
} }
@ -2902,7 +2912,7 @@ fn test_search_paths_tracking_hash_different_order() {
const JSON: super::ErrorOutputType = super::ErrorOutputType::Json { const JSON: super::ErrorOutputType = super::ErrorOutputType::Json {
pretty: false, pretty: false,
colorful_rendered: false, json_rendered: super::HumanReadableErrorType::Default(super::ColorConfig::Never),
}; };
// Reference // Reference

72
src/librustc/session/mod.rs
View File

@ -1037,44 +1037,42 @@ fn default_emitter(
emitter_dest: Option<Box<dyn Write + Send>>, emitter_dest: Option<Box<dyn Write + Send>>,
) -> Box<dyn Emitter + sync::Send> { ) -> Box<dyn Emitter + sync::Send> {
match (sopts.error_format, emitter_dest) { match (sopts.error_format, emitter_dest) {
(config::ErrorOutputType::HumanReadable(color_config), None) => Box::new( (config::ErrorOutputType::HumanReadable(kind), dst) => {
EmitterWriter::stderr( let (short, color_config) = kind.unzip();
color_config, let emitter = match dst {
Some(source_map.clone()), None => EmitterWriter::stderr(
false, color_config,
sopts.debugging_opts.teach, Some(source_map.clone()),
).ui_testing(sopts.debugging_opts.ui_testing), short,
), sopts.debugging_opts.teach,
(config::ErrorOutputType::HumanReadable(_), Some(dst)) => Box::new( ),
EmitterWriter::new( Some(dst) => EmitterWriter::new(
dst, Some(source_map.clone()), false, false, sopts.debugging_opts.colorful_json, dst,
).ui_testing(sopts.debugging_opts.ui_testing), Some(source_map.clone()),
), short,
(config::ErrorOutputType::Json { pretty, colorful_rendered }, None) => Box::new( false,
color_config.suggests_using_colors(),
),
};
Box::new(emitter.ui_testing(sopts.debugging_opts.ui_testing))
},
(config::ErrorOutputType::Json { pretty, json_rendered }, None) => Box::new(
JsonEmitter::stderr( JsonEmitter::stderr(
Some(registry), Some(registry),
source_map.clone(), source_map.clone(),
pretty, pretty,
colorful_rendered, json_rendered,
).ui_testing(sopts.debugging_opts.ui_testing), ).ui_testing(sopts.debugging_opts.ui_testing),
), ),
(config::ErrorOutputType::Json { pretty, colorful_rendered }, Some(dst)) => Box::new( (config::ErrorOutputType::Json { pretty, json_rendered }, Some(dst)) => Box::new(
JsonEmitter::new( JsonEmitter::new(
dst, dst,
Some(registry), Some(registry),
source_map.clone(), source_map.clone(),
pretty, pretty,
colorful_rendered, json_rendered,
).ui_testing(sopts.debugging_opts.ui_testing), ).ui_testing(sopts.debugging_opts.ui_testing),
), ),
(config::ErrorOutputType::Short(color_config), None) => Box::new(
EmitterWriter::stderr(color_config, Some(source_map.clone()), true, false),
),
(config::ErrorOutputType::Short(_), Some(dst)) => {
Box::new(EmitterWriter::new(
dst, Some(source_map.clone()), true, false, sopts.debugging_opts.colorful_json,
))
}
} }
} }
@ -1319,14 +1317,12 @@ pub enum IncrCompSession {
pub fn early_error(output: config::ErrorOutputType, msg: &str) -> ! { pub fn early_error(output: config::ErrorOutputType, msg: &str) -> ! {
let emitter: Box<dyn Emitter + sync::Send> = match output { let emitter: Box<dyn Emitter + sync::Send> = match output {
config::ErrorOutputType::HumanReadable(color_config) => { config::ErrorOutputType::HumanReadable(kind) => {
Box::new(EmitterWriter::stderr(color_config, None, false, false)) let (short, color_config) = kind.unzip();
} Box::new(EmitterWriter::stderr(color_config, None, short, false))
config::ErrorOutputType::Json { pretty, colorful_rendered } =>
Box::new(JsonEmitter::basic(pretty, colorful_rendered)),
config::ErrorOutputType::Short(color_config) => {
Box::new(EmitterWriter::stderr(color_config, None, true, false))
} }
config::ErrorOutputType::Json { pretty, json_rendered } =>
Box::new(JsonEmitter::basic(pretty, json_rendered)),
}; };
let handler = errors::Handler::with_emitter(true, None, emitter); let handler = errors::Handler::with_emitter(true, None, emitter);
handler.emit(&MultiSpan::new(), msg, errors::Level::Fatal); handler.emit(&MultiSpan::new(), msg, errors::Level::Fatal);
@ -1335,14 +1331,12 @@ pub fn early_error(output: config::ErrorOutputType, msg: &str) -> ! {
pub fn early_warn(output: config::ErrorOutputType, msg: &str) { pub fn early_warn(output: config::ErrorOutputType, msg: &str) {
let emitter: Box<dyn Emitter + sync::Send> = match output { let emitter: Box<dyn Emitter + sync::Send> = match output {
config::ErrorOutputType::HumanReadable(color_config) => { config::ErrorOutputType::HumanReadable(kind) => {
Box::new(EmitterWriter::stderr(color_config, None, false, false)) let (short, color_config) = kind.unzip();
} Box::new(EmitterWriter::stderr(color_config, None, short, false))
config::ErrorOutputType::Json { pretty, colorful_rendered } =>
Box::new(JsonEmitter::basic(pretty, colorful_rendered)),
config::ErrorOutputType::Short(color_config) => {
Box::new(EmitterWriter::stderr(color_config, None, true, false))
} }
config::ErrorOutputType::Json { pretty, json_rendered } =>
Box::new(JsonEmitter::basic(pretty, json_rendered)),
}; };
let handler = errors::Handler::with_emitter(true, None, emitter); let handler = errors::Handler::with_emitter(true, None, emitter);
handler.emit(&MultiSpan::new(), msg, errors::Level::Warning); handler.emit(&MultiSpan::new(), msg, errors::Level::Warning);

39
src/librustc_errors/emitter.rs
View File

@ -19,6 +19,32 @@
use termcolor::{StandardStream, ColorChoice, ColorSpec, BufferWriter, Ansi}; use termcolor::{StandardStream, ColorChoice, ColorSpec, BufferWriter, Ansi};
use termcolor::{WriteColor, Color, Buffer}; use termcolor::{WriteColor, Color, Buffer};
/// Describes the way the content of the `rendered` field of the json output is generated
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum HumanReadableErrorType {
Default(ColorConfig),
Short(ColorConfig),
}
impl HumanReadableErrorType {
/// Returns a (`short`, `color`) tuple
pub fn unzip(self) -> (bool, ColorConfig) {
match self {
HumanReadableErrorType::Default(cc) => (false, cc),
HumanReadableErrorType::Short(cc) => (true, cc),
}
}
pub fn new_emitter(
self,
dst: Box<dyn Write + Send>,
source_map: Option<Lrc<SourceMapperDyn>>,
teach: bool,
) -> EmitterWriter {
let (short, color_config) = self.unzip();
EmitterWriter::new(dst, source_map, short, teach, color_config.suggests_using_colors())
}
}
const ANONYMIZED_LINE_NUM: &str = "LL"; const ANONYMIZED_LINE_NUM: &str = "LL";
/// Emitter trait for emitting errors. /// Emitter trait for emitting errors.
@ -104,8 +130,8 @@ pub enum ColorConfig {
} }
impl ColorConfig { impl ColorConfig {
fn to_color_choice(&self) -> ColorChoice { fn to_color_choice(self) -> ColorChoice {
match *self { match self {
ColorConfig::Always => { ColorConfig::Always => {
if atty::is(atty::Stream::Stderr) { if atty::is(atty::Stream::Stderr) {
ColorChoice::Always ColorChoice::Always
@ -120,6 +146,14 @@ fn to_color_choice(&self) -> ColorChoice {
ColorConfig::Auto => ColorChoice::Never, ColorConfig::Auto => ColorChoice::Never,
} }
} }
pub fn suggests_using_colors(self) -> bool {
match self {
| ColorConfig::Always
| ColorConfig::Auto
=> true,
ColorConfig::Never => false,
}
}
} }
pub struct EmitterWriter { pub struct EmitterWriter {
@ -1540,6 +1574,7 @@ fn emit_to_destination(rendered_buffer: &[Vec<StyledString>],
pub enum Destination { pub enum Destination {
Terminal(StandardStream), Terminal(StandardStream),
Buffered(BufferWriter), Buffered(BufferWriter),
// The bool denotes whether we should be emitting ansi color codes or not
Raw(Box<(dyn Write + Send)>, bool), Raw(Box<(dyn Write + Send)>, bool),
} }

18
src/librustdoc/config.rs
View File

@ -3,7 +3,7 @@
use std::path::PathBuf; use std::path::PathBuf;
use errors; use errors;
use errors::emitter::ColorConfig; use errors::emitter::{ColorConfig, HumanReadableErrorType};
use getopts; use getopts;
use rustc::lint::Level; use rustc::lint::Level;
use rustc::session::early_error; use rustc::session::early_error;
@ -256,11 +256,17 @@ pub fn from_matches(matches: &getopts::Matches) -> Result<Options, i32> {
}; };
// FIXME: deduplicate this code from the identical code in librustc/session/config.rs // FIXME: deduplicate this code from the identical code in librustc/session/config.rs
let error_format = match matches.opt_str("error-format").as_ref().map(|s| &s[..]) { let error_format = match matches.opt_str("error-format").as_ref().map(|s| &s[..]) {
Some("human") => ErrorOutputType::HumanReadable(color), None |
Some("json") => ErrorOutputType::Json { pretty: false, colorful_rendered: false }, Some("human") => ErrorOutputType::HumanReadable(HumanReadableErrorType::Default(color)),
Some("pretty-json") => ErrorOutputType::Json { pretty: true, colorful_rendered: false }, Some("json") => ErrorOutputType::Json {
Some("short") => ErrorOutputType::Short(color), pretty: false,
None => ErrorOutputType::HumanReadable(color), json_rendered: HumanReadableErrorType::Default(color),
},
Some("pretty-json") => ErrorOutputType::Json {
pretty: true,
json_rendered: HumanReadableErrorType::Default(color),
},
Some("short") => ErrorOutputType::HumanReadable(HumanReadableErrorType::Short(color)),
Some(arg) => { Some(arg) => {
early_error(ErrorOutputType::default(), early_error(ErrorOutputType::default(),
&format!("argument for --error-format must be `human`, `json` or \ &format!("argument for --error-format must be `human`, `json` or \

30
src/librustdoc/core.rs
View File

@ -299,15 +299,18 @@ pub fn new_handler(error_format: ErrorOutputType,
// stick to the defaults // stick to the defaults
let sessopts = Options::default(); let sessopts = Options::default();
let emitter: Box<dyn Emitter + sync::Send> = match error_format { let emitter: Box<dyn Emitter + sync::Send> = match error_format {
ErrorOutputType::HumanReadable(color_config) => Box::new( ErrorOutputType::HumanReadable(kind) => {
EmitterWriter::stderr( let (short, color_config) = kind.unzip();
color_config, Box::new(
source_map.map(|cm| cm as _), EmitterWriter::stderr(
false, color_config,
sessopts.debugging_opts.teach, source_map.map(|cm| cm as _),
).ui_testing(ui_testing) short,
), sessopts.debugging_opts.teach,
ErrorOutputType::Json { pretty, colorful_rendered } => { ).ui_testing(ui_testing)
)
},
ErrorOutputType::Json { pretty, json_rendered } => {
let source_map = source_map.unwrap_or_else( let source_map = source_map.unwrap_or_else(
|| Lrc::new(source_map::SourceMap::new(sessopts.file_path_mapping()))); || Lrc::new(source_map::SourceMap::new(sessopts.file_path_mapping())));
Box::new( Box::new(
@ -315,17 +318,10 @@ pub fn new_handler(error_format: ErrorOutputType,
None, None,
source_map, source_map,
pretty, pretty,
colorful_rendered, json_rendered,
).ui_testing(ui_testing) ).ui_testing(ui_testing)
) )
}, },
ErrorOutputType::Short(color_config) => Box::new(
EmitterWriter::stderr(
color_config,
source_map.map(|cm| cm as _),
true,
false)
),
}; };
errors::Handler::with_emitter_and_flags( errors::Handler::with_emitter_and_flags(

18
src/libsyntax/json.rs
View File

@ -14,7 +14,7 @@
use errors::registry::Registry; use errors::registry::Registry;
use errors::{DiagnosticBuilder, SubDiagnostic, CodeSuggestion, SourceMapper}; use errors::{DiagnosticBuilder, SubDiagnostic, CodeSuggestion, SourceMapper};
use errors::{DiagnosticId, Applicability}; use errors::{DiagnosticId, Applicability};
use errors::emitter::{Emitter, EmitterWriter}; use errors::emitter::{Emitter, HumanReadableErrorType};
use syntax_pos::{MacroBacktrace, Span, SpanLabel, MultiSpan}; use syntax_pos::{MacroBacktrace, Span, SpanLabel, MultiSpan};
use rustc_data_structures::sync::{self, Lrc}; use rustc_data_structures::sync::{self, Lrc};
@ -30,7 +30,7 @@ pub struct JsonEmitter {
sm: Lrc<dyn SourceMapper + sync::Send + sync::Sync>, sm: Lrc<dyn SourceMapper + sync::Send + sync::Sync>,
pretty: bool, pretty: bool,
ui_testing: bool, ui_testing: bool,
colorful_rendered: bool, json_rendered: HumanReadableErrorType,
} }
impl JsonEmitter { impl JsonEmitter {
@ -38,7 +38,7 @@ pub fn stderr(
registry: Option<Registry>, registry: Option<Registry>,
source_map: Lrc<SourceMap>, source_map: Lrc<SourceMap>,
pretty: bool, pretty: bool,
colorful_rendered: bool, json_rendered: HumanReadableErrorType,
) -> JsonEmitter { ) -> JsonEmitter {
JsonEmitter { JsonEmitter {
dst: Box::new(io::stderr()), dst: Box::new(io::stderr()),
@ -46,14 +46,14 @@ pub fn stderr(
sm: source_map, sm: source_map,
pretty, pretty,
ui_testing: false, ui_testing: false,
colorful_rendered, json_rendered,
} }
} }
pub fn basic(pretty: bool, colorful_rendered: bool) -> JsonEmitter { pub fn basic(pretty: bool, json_rendered: HumanReadableErrorType) -> JsonEmitter {
let file_path_mapping = FilePathMapping::empty(); let file_path_mapping = FilePathMapping::empty();
JsonEmitter::stderr(None, Lrc::new(SourceMap::new(file_path_mapping)), JsonEmitter::stderr(None, Lrc::new(SourceMap::new(file_path_mapping)),
pretty, colorful_rendered) pretty, json_rendered)
} }
pub fn new( pub fn new(
@ -61,7 +61,7 @@ pub fn new(
registry: Option<Registry>, registry: Option<Registry>,
source_map: Lrc<SourceMap>, source_map: Lrc<SourceMap>,
pretty: bool, pretty: bool,
colorful_rendered: bool, json_rendered: HumanReadableErrorType,
) -> JsonEmitter { ) -> JsonEmitter {
JsonEmitter { JsonEmitter {
dst, dst,
@ -69,7 +69,7 @@ pub fn new(
sm: source_map, sm: source_map,
pretty, pretty,
ui_testing: false, ui_testing: false,
colorful_rendered, json_rendered,
} }
} }
@ -199,7 +199,7 @@ fn flush(&mut self) -> io::Result<()> {
} }
let buf = BufWriter::default(); let buf = BufWriter::default();
let output = buf.clone(); let output = buf.clone();
EmitterWriter::new(Box::new(buf), Some(je.sm.clone()), false, false, je.colorful_rendered) je.json_rendered.new_emitter(Box::new(buf), Some(je.sm.clone()), false)
.ui_testing(je.ui_testing).emit(db); .ui_testing(je.ui_testing).emit(db);
let output = Arc::try_unwrap(output.0).unwrap().into_inner().unwrap(); let output = Arc::try_unwrap(output.0).unwrap().into_inner().unwrap();
let output = String::from_utf8(output).unwrap(); let output = String::from_utf8(output).unwrap();

2
src/test/ui/lint/use_suggestion_json.rs
View File

@ -1,5 +1,5 @@
// ignore-cloudabi // ignore-cloudabi
// compile-flags: --error-format pretty-json -Zunstable-options --colorful-json=true // compile-flags: --error-format pretty-json -Zunstable-options --json-rendered=termcolor
// The output for humans should just highlight the whole span without showing // The output for humans should just highlight the whole span without showing
// the suggested replacement, but we also want to test that suggested // the suggested replacement, but we also want to test that suggested

52
src/test/ui/lint/use_suggestion_json.stderr
View File

@ -73,8 +73,8 @@ mod foo {
"spans": [ "spans": [
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 461, "byte_start": 466,
"byte_end": 465, "byte_end": 470,
"line_start": 11, "line_start": 11,
"line_end": 11, "line_end": 11,
"column_start": 12, "column_start": 12,
@ -101,8 +101,8 @@ mod foo {
"spans": [ "spans": [
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 438, "byte_start": 443,
"byte_end": 438, "byte_end": 443,
"line_start": 10, "line_start": 10,
"line_end": 10, "line_end": 10,
"column_start": 1, "column_start": 1,
@ -124,8 +124,8 @@ mod foo {
}, },
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 438, "byte_start": 443,
"byte_end": 438, "byte_end": 443,
"line_start": 10, "line_start": 10,
"line_end": 10, "line_end": 10,
"column_start": 1, "column_start": 1,
@ -147,8 +147,8 @@ mod foo {
}, },
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 438, "byte_start": 443,
"byte_end": 438, "byte_end": 443,
"line_start": 10, "line_start": 10,
"line_end": 10, "line_end": 10,
"column_start": 1, "column_start": 1,
@ -170,8 +170,8 @@ mod foo {
}, },
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 438, "byte_start": 443,
"byte_end": 438, "byte_end": 443,
"line_start": 10, "line_start": 10,
"line_end": 10, "line_end": 10,
"column_start": 1, "column_start": 1,
@ -193,8 +193,8 @@ mod foo {
}, },
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 438, "byte_start": 443,
"byte_end": 438, "byte_end": 443,
"line_start": 10, "line_start": 10,
"line_end": 10, "line_end": 10,
"column_start": 1, "column_start": 1,
@ -216,8 +216,8 @@ mod foo {
}, },
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 438, "byte_start": 443,
"byte_end": 438, "byte_end": 443,
"line_start": 10, "line_start": 10,
"line_end": 10, "line_end": 10,
"column_start": 1, "column_start": 1,
@ -239,8 +239,8 @@ mod foo {
}, },
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 438, "byte_start": 443,
"byte_end": 438, "byte_end": 443,
"line_start": 10, "line_start": 10,
"line_end": 10, "line_end": 10,
"column_start": 1, "column_start": 1,
@ -262,8 +262,8 @@ mod foo {
}, },
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 438, "byte_start": 443,
"byte_end": 438, "byte_end": 443,
"line_start": 10, "line_start": 10,
"line_end": 10, "line_end": 10,
"column_start": 1, "column_start": 1,
@ -285,8 +285,8 @@ mod foo {
}, },
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 438, "byte_start": 443,
"byte_end": 438, "byte_end": 443,
"line_start": 10, "line_start": 10,
"line_end": 10, "line_end": 10,
"column_start": 1, "column_start": 1,
@ -308,8 +308,8 @@ mod foo {
}, },
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 438, "byte_start": 443,
"byte_end": 438, "byte_end": 443,
"line_start": 10, "line_start": 10,
"line_end": 10, "line_end": 10,
"column_start": 1, "column_start": 1,
@ -331,8 +331,8 @@ mod foo {
}, },
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 438, "byte_start": 443,
"byte_end": 438, "byte_end": 443,
"line_start": 10, "line_start": 10,
"line_end": 10, "line_end": 10,
"column_start": 1, "column_start": 1,
@ -354,8 +354,8 @@ mod foo {
}, },
{ {
"file_name": "$DIR/use_suggestion_json.rs", "file_name": "$DIR/use_suggestion_json.rs",
"byte_start": 438, "byte_start": 443,
"byte_end": 438, "byte_end": 443,
"line_start": 10, "line_start": 10,
"line_end": 10, "line_end": 10,
"column_start": 1, "column_start": 1,