Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Stabilize suggestion applicability field in json output
  • Loading branch information
Manishearth committed May 21, 2018
1 parent 6e6a4b1 commit 30bd586
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 22 deletions.
2 changes: 0 additions & 2 deletions src/librustc/session/config.rs
Expand Up @@ -1316,8 +1316,6 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
dep_info_omit_d_target: bool = (false, parse_bool, [TRACKED],
"in dep-info output, omit targets for tracking dependencies of the dep-info files \
themselves"),
suggestion_applicability: bool = (false, parse_bool, [UNTRACKED],
"include machine-applicability of suggestions in JSON output"),
unpretty: Option<String> = (None, parse_unpretty, [UNTRACKED],
"Present the input source, unstable (and less-pretty) variants;
valid types are any of the types for `--pretty`, as well as:
Expand Down
2 changes: 0 additions & 2 deletions src/librustc/session/mod.rs
Expand Up @@ -1018,7 +1018,6 @@ pub fn build_session_with_codemap(
Some(registry),
codemap.clone(),
pretty,
sopts.debugging_opts.suggestion_applicability,
).ui_testing(sopts.debugging_opts.ui_testing),
),
(config::ErrorOutputType::Json(pretty), Some(dst)) => Box::new(
Expand All @@ -1027,7 +1026,6 @@ pub fn build_session_with_codemap(
Some(registry),
codemap.clone(),
pretty,
sopts.debugging_opts.suggestion_applicability,
).ui_testing(sopts.debugging_opts.ui_testing),
),
(config::ErrorOutputType::Short(color_config), None) => Box::new(
Expand Down
1 change: 0 additions & 1 deletion src/librustdoc/core.rs
Expand Up @@ -144,7 +144,6 @@ pub fn new_handler(error_format: ErrorOutputType, codemap: Option<Lrc<codemap::C
None,
codemap,
pretty,
sessopts.debugging_opts.suggestion_applicability,
).ui_testing(sessopts.debugging_opts.ui_testing)
)
},
Expand Down
21 changes: 4 additions & 17 deletions src/libsyntax/json.rs
Expand Up @@ -38,43 +38,37 @@ pub struct JsonEmitter {
registry: Option<Registry>,
cm: Lrc<CodeMapper + sync::Send + sync::Sync>,
pretty: bool,
/// Whether "approximate suggestions" are enabled in the config
suggestion_applicability: bool,
ui_testing: bool,
}

impl JsonEmitter {
pub fn stderr(registry: Option<Registry>,
code_map: Lrc<CodeMap>,
pretty: bool,
suggestion_applicability: bool) -> JsonEmitter {
pretty: bool) -> JsonEmitter {
JsonEmitter {
dst: Box::new(io::stderr()),
registry,
cm: code_map,
pretty,
suggestion_applicability,
ui_testing: false,
}
}

pub fn basic(pretty: bool) -> JsonEmitter {
let file_path_mapping = FilePathMapping::empty();
JsonEmitter::stderr(None, Lrc::new(CodeMap::new(file_path_mapping)),
pretty, false)
pretty)
}

pub fn new(dst: Box<Write + Send>,
registry: Option<Registry>,
code_map: Lrc<CodeMap>,
pretty: bool,
suggestion_applicability: bool) -> JsonEmitter {
pretty: bool) -> JsonEmitter {
JsonEmitter {
dst,
registry,
cm: code_map,
pretty,
suggestion_applicability,
ui_testing: false,
}
}
Expand Down Expand Up @@ -137,7 +131,6 @@ struct DiagnosticSpan {
/// that should be sliced in atop this span.
suggested_replacement: Option<String>,
/// If the suggestion is approximate
#[rustc_serialize_exclude_null]
suggestion_applicability: Option<Applicability>,
/// Macro invocations that created the code at this span, if any.
expansion: Option<Box<DiagnosticSpanMacroExpansion>>,
Expand Down Expand Up @@ -301,12 +294,6 @@ impl DiagnosticSpan {
})
});

let suggestion_applicability = if je.suggestion_applicability {
suggestion.map(|x| x.1)
} else {
None
};

DiagnosticSpan {
file_name: start.file.name.to_string(),
byte_start: span.lo().0 - start.file.start_pos.0,
Expand All @@ -318,7 +305,7 @@ impl DiagnosticSpan {
is_primary,
text: DiagnosticSpanLine::from_span(span, je),
suggested_replacement: suggestion.map(|x| x.0.clone()),
suggestion_applicability,
suggestion_applicability: suggestion.map(|x| x.1),
expansion: backtrace_step,
label,
}
Expand Down

0 comments on commit 30bd586

Please sign in to comment.