Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Stabilize suggestion applicability field in json output #50486

Merged
merged 3 commits into from
May 22, 2018
Merged

Stabilize suggestion applicability field in json output #50486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30bd586
Stabilize suggestion applicability field in json output
Manishearth May 6, 2018
1d8a4d1
Remove rustc_serialize_exclude_null
Manishearth May 6, 2018
b0e6638
update tests
Manishearth May 21, 2018
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
2 changes: 0 additions & 2 deletions src/librustc/session/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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
5 changes: 0 additions & 5 deletions src/libsyntax/feature_gate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,11 +846,6 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
("rustc_serialize_exclude_null", Normal, Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_serialize_exclude_null]` attribute \
is an internal-only feature",
cfg_fn!(rustc_attrs))),
("rustc_synthetic", Whitelisted, Gated(Stability::Unstable,
"rustc_attrs",
"this attribute \
Expand Down
21 changes: 4 additions & 17 deletions src/libsyntax/json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
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>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Am I reading the code below correctly as: suggestion_applicability is always Some when suggested_replacement is Some? If so, we might want to document this here.

/// 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
14 changes: 2 additions & 12 deletions src/libsyntax_ext/deriving/encodable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ fn encodable_substructure(cx: &mut ExtCtxt,
Struct(_, ref fields) => {
let emit_struct_field = cx.ident_of("emit_struct_field");
let mut stmts = Vec::new();
for (i, &FieldInfo { name, ref self_, span, attrs, .. }) in fields.iter().enumerate() {
for (i, &FieldInfo { name, ref self_, span, .. }) in fields.iter().enumerate() {
let name = match name {
Some(id) => id.name,
None => Symbol::intern(&format!("_field{}", i)),
Expand All @@ -213,17 +213,7 @@ fn encodable_substructure(cx: &mut ExtCtxt,
cx.expr(span, ExprKind::Ret(Some(call)))
};

// This exists for https://github.com/rust-lang/rust/pull/47540
//
// If we decide to stabilize that flag this can be removed
let expr = if attrs.iter().any(|a| a.check_name("rustc_serialize_exclude_null")) {
let is_some = cx.ident_of("is_some");
let condition = cx.expr_method_call(span, self_.clone(), is_some, vec![]);
cx.expr_if(span, condition, call, None)
} else {
call
};
let stmt = cx.stmt_expr(expr);
let stmt = cx.stmt_expr(call);
stmts.push(stmt);
}

Expand Down
3 changes: 3 additions & 0 deletions src/test/ui/lint/unused_parens_json_suggestion.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
],
"label": null,
"suggested_replacement": null,
"suggestion_applicability": null,
"expansion": null
}
],
Expand Down Expand Up @@ -51,6 +52,7 @@
],
"label": null,
"suggested_replacement": null,
"suggestion_applicability": null,
"expansion": null
}
],
Expand Down Expand Up @@ -80,6 +82,7 @@
],
"label": null,
"suggested_replacement": "1 / (2 + 3)",
"suggestion_applicability": "Unspecified",
"expansion": null
}
],
Expand Down
13 changes: 13 additions & 0 deletions src/test/ui/lint/use_suggestion_json.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ mod foo {
],
"label": "not found in this scope",
"suggested_replacement": null,
"suggestion_applicability": null,
"expansion": null
}
],
Expand Down Expand Up @@ -118,6 +119,7 @@ mod foo {
"suggested_replacement": "use std::collections::binary_heap::Iter;

",
"suggestion_applicability": "Unspecified",
"expansion": null
},
{
Expand All @@ -140,6 +142,7 @@ mod foo {
"suggested_replacement": "use std::collections::btree_map::Iter;

",
"suggestion_applicability": "Unspecified",
"expansion": null
},
{
Expand All @@ -162,6 +165,7 @@ mod foo {
"suggested_replacement": "use std::collections::btree_set::Iter;

",
"suggestion_applicability": "Unspecified",
"expansion": null
},
{
Expand All @@ -184,6 +188,7 @@ mod foo {
"suggested_replacement": "use std::collections::hash_map::Iter;

",
"suggestion_applicability": "Unspecified",
"expansion": null
},
{
Expand All @@ -206,6 +211,7 @@ mod foo {
"suggested_replacement": "use std::collections::hash_set::Iter;

",
"suggestion_applicability": "Unspecified",
"expansion": null
},
{
Expand All @@ -228,6 +234,7 @@ mod foo {
"suggested_replacement": "use std::collections::linked_list::Iter;

",
"suggestion_applicability": "Unspecified",
"expansion": null
},
{
Expand All @@ -250,6 +257,7 @@ mod foo {
"suggested_replacement": "use std::collections::vec_deque::Iter;

",
"suggestion_applicability": "Unspecified",
"expansion": null
},
{
Expand All @@ -272,6 +280,7 @@ mod foo {
"suggested_replacement": "use std::option::Iter;

",
"suggestion_applicability": "Unspecified",
"expansion": null
},
{
Expand All @@ -294,6 +303,7 @@ mod foo {
"suggested_replacement": "use std::path::Iter;

",
"suggestion_applicability": "Unspecified",
"expansion": null
},
{
Expand All @@ -316,6 +326,7 @@ mod foo {
"suggested_replacement": "use std::result::Iter;

",
"suggestion_applicability": "Unspecified",
"expansion": null
},
{
Expand All @@ -338,6 +349,7 @@ mod foo {
"suggested_replacement": "use std::slice::Iter;

",
"suggestion_applicability": "Unspecified",
"expansion": null
},
{
Expand All @@ -360,6 +372,7 @@ mod foo {
"suggested_replacement": "use std::sync::mpsc::Iter;

",
"suggestion_applicability": "Unspecified",
"expansion": null
}
],
Expand Down