Skip to content

Commit 38fd7ea

Browse files
borsbors
committed
Auto merge of #50486 - Manishearth:approx-stab, r=nrc
Stabilize suggestion applicability field in json output cc @killercup r? @nrc
2 parents 65a16c0 + b0e6638 commit 38fd7ea

File tree

8 files changed

+22
-39
lines changed

8 files changed

+22
-39
lines changed

‎src/librustc/session/config.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,8 +1316,6 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
13161316
dep_info_omit_d_target: bool = (false, parse_bool, [TRACKED],
13171317
"in dep-info output, omit targets for tracking dependencies of the dep-info files \
13181318
themselves"),
1319-
suggestion_applicability: bool = (false, parse_bool, [UNTRACKED],
1320-
"include machine-applicability of suggestions in JSON output"),
13211319
unpretty: Option<String> = (None, parse_unpretty, [UNTRACKED],
13221320
"Present the input source, unstable (and less-pretty) variants;
13231321
valid types are any of the types for `--pretty`, as well as:

‎src/librustc/session/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,6 @@ pub fn build_session_with_codemap(
10181018
Some(registry),
10191019
codemap.clone(),
10201020
pretty,
1021-
sopts.debugging_opts.suggestion_applicability,
10221021
).ui_testing(sopts.debugging_opts.ui_testing),
10231022
),
10241023
(config::ErrorOutputType::Json(pretty), Some(dst)) => Box::new(
@@ -1027,7 +1026,6 @@ pub fn build_session_with_codemap(
10271026
Some(registry),
10281027
codemap.clone(),
10291028
pretty,
1030-
sopts.debugging_opts.suggestion_applicability,
10311029
).ui_testing(sopts.debugging_opts.ui_testing),
10321030
),
10331031
(config::ErrorOutputType::Short(color_config), None) => Box::new(

‎src/librustdoc/core.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ pub fn new_handler(error_format: ErrorOutputType, codemap: Option<Lrc<codemap::C
144144
None,
145145
codemap,
146146
pretty,
147-
sessopts.debugging_opts.suggestion_applicability,
148147
).ui_testing(sessopts.debugging_opts.ui_testing)
149148
)
150149
},

‎src/libsyntax/feature_gate.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -846,11 +846,6 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
846846
is just used for rustc unit tests \
847847
and will never be stable",
848848
cfg_fn!(rustc_attrs))),
849-
("rustc_serialize_exclude_null", Normal, Gated(Stability::Unstable,
850-
"rustc_attrs",
851-
"the `#[rustc_serialize_exclude_null]` attribute \
852-
is an internal-only feature",
853-
cfg_fn!(rustc_attrs))),
854849
("rustc_synthetic", Whitelisted, Gated(Stability::Unstable,
855850
"rustc_attrs",
856851
"this attribute \

‎src/libsyntax/json.rs

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,43 +38,37 @@ pub struct JsonEmitter {
3838
registry: Option<Registry>,
3939
cm: Lrc<CodeMapper + sync::Send + sync::Sync>,
4040
pretty: bool,
41-
/// Whether "approximate suggestions" are enabled in the config
42-
suggestion_applicability: bool,
4341
ui_testing: bool,
4442
}
4543

4644
impl JsonEmitter {
4745
pub fn stderr(registry: Option<Registry>,
4846
code_map: Lrc<CodeMap>,
49-
pretty: bool,
50-
suggestion_applicability: bool) -> JsonEmitter {
47+
pretty: bool) -> JsonEmitter {
5148
JsonEmitter {
5249
dst: Box::new(io::stderr()),
5350
registry,
5451
cm: code_map,
5552
pretty,
56-
suggestion_applicability,
5753
ui_testing: false,
5854
}
5955
}
6056

6157
pub fn basic(pretty: bool) -> JsonEmitter {
6258
let file_path_mapping = FilePathMapping::empty();
6359
JsonEmitter::stderr(None, Lrc::new(CodeMap::new(file_path_mapping)),
64-
pretty, false)
60+
pretty)
6561
}
6662

6763
pub fn new(dst: Box<Write + Send>,
6864
registry: Option<Registry>,
6965
code_map: Lrc<CodeMap>,
70-
pretty: bool,
71-
suggestion_applicability: bool) -> JsonEmitter {
66+
pretty: bool) -> JsonEmitter {
7267
JsonEmitter {
7368
dst,
7469
registry,
7570
cm: code_map,
7671
pretty,
77-
suggestion_applicability,
7872
ui_testing: false,
7973
}
8074
}
@@ -137,7 +131,6 @@ struct DiagnosticSpan {
137131
/// that should be sliced in atop this span.
138132
suggested_replacement: Option<String>,
139133
/// If the suggestion is approximate
140-
#[rustc_serialize_exclude_null]
141134
suggestion_applicability: Option<Applicability>,
142135
/// Macro invocations that created the code at this span, if any.
143136
expansion: Option<Box<DiagnosticSpanMacroExpansion>>,
@@ -301,12 +294,6 @@ impl DiagnosticSpan {
301294
})
302295
});
303296

304-
let suggestion_applicability = if je.suggestion_applicability {
305-
suggestion.map(|x| x.1)
306-
} else {
307-
None
308-
};
309-
310297
DiagnosticSpan {
311298
file_name: start.file.name.to_string(),
312299
byte_start: span.lo().0 - start.file.start_pos.0,
@@ -318,7 +305,7 @@ impl DiagnosticSpan {
318305
is_primary,
319306
text: DiagnosticSpanLine::from_span(span, je),
320307
suggested_replacement: suggestion.map(|x| x.0.clone()),
321-
suggestion_applicability,
308+
suggestion_applicability: suggestion.map(|x| x.1),
322309
expansion: backtrace_step,
323310
label,
324311
}

‎src/libsyntax_ext/deriving/encodable.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ fn encodable_substructure(cx: &mut ExtCtxt,
190190
Struct(_, ref fields) => {
191191
let emit_struct_field = cx.ident_of("emit_struct_field");
192192
let mut stmts = Vec::new();
193-
for (i, &FieldInfo { name, ref self_, span, attrs, .. }) in fields.iter().enumerate() {
193+
for (i, &FieldInfo { name, ref self_, span, .. }) in fields.iter().enumerate() {
194194
let name = match name {
195195
Some(id) => id.name,
196196
None => Symbol::intern(&format!("_field{}", i)),
@@ -213,17 +213,7 @@ fn encodable_substructure(cx: &mut ExtCtxt,
213213
cx.expr(span, ExprKind::Ret(Some(call)))
214214
};
215215

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

‎src/test/ui/lint/unused_parens_json_suggestion.stderr

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
],
2525
"label": null,
2626
"suggested_replacement": null,
27+
"suggestion_applicability": null,
2728
"expansion": null
2829
}
2930
],
@@ -51,6 +52,7 @@
5152
],
5253
"label": null,
5354
"suggested_replacement": null,
55+
"suggestion_applicability": null,
5456
"expansion": null
5557
}
5658
],
@@ -80,6 +82,7 @@
8082
],
8183
"label": null,
8284
"suggested_replacement": "1 / (2 + 3)",
85+
"suggestion_applicability": "Unspecified",
8386
"expansion": null
8487
}
8588
],

‎src/test/ui/lint/use_suggestion_json.stderr

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ mod foo {
8989
],
9090
"label": "not found in this scope",
9191
"suggested_replacement": null,
92+
"suggestion_applicability": null,
9293
"expansion": null
9394
}
9495
],
@@ -118,6 +119,7 @@ mod foo {
118119
"suggested_replacement": "use std::collections::binary_heap::Iter;
119120

120121
",
122+
"suggestion_applicability": "Unspecified",
121123
"expansion": null
122124
},
123125
{
@@ -140,6 +142,7 @@ mod foo {
140142
"suggested_replacement": "use std::collections::btree_map::Iter;
141143

142144
",
145+
"suggestion_applicability": "Unspecified",
143146
"expansion": null
144147
},
145148
{
@@ -162,6 +165,7 @@ mod foo {
162165
"suggested_replacement": "use std::collections::btree_set::Iter;
163166

164167
",
168+
"suggestion_applicability": "Unspecified",
165169
"expansion": null
166170
},
167171
{
@@ -184,6 +188,7 @@ mod foo {
184188
"suggested_replacement": "use std::collections::hash_map::Iter;
185189

186190
",
191+
"suggestion_applicability": "Unspecified",
187192
"expansion": null
188193
},
189194
{
@@ -206,6 +211,7 @@ mod foo {
206211
"suggested_replacement": "use std::collections::hash_set::Iter;
207212

208213
",
214+
"suggestion_applicability": "Unspecified",
209215
"expansion": null
210216
},
211217
{
@@ -228,6 +234,7 @@ mod foo {
228234
"suggested_replacement": "use std::collections::linked_list::Iter;
229235

230236
",
237+
"suggestion_applicability": "Unspecified",
231238
"expansion": null
232239
},
233240
{
@@ -250,6 +257,7 @@ mod foo {
250257
"suggested_replacement": "use std::collections::vec_deque::Iter;
251258

252259
",
260+
"suggestion_applicability": "Unspecified",
253261
"expansion": null
254262
},
255263
{
@@ -272,6 +280,7 @@ mod foo {
272280
"suggested_replacement": "use std::option::Iter;
273281

274282
",
283+
"suggestion_applicability": "Unspecified",
275284
"expansion": null
276285
},
277286
{
@@ -294,6 +303,7 @@ mod foo {
294303
"suggested_replacement": "use std::path::Iter;
295304

296305
",
306+
"suggestion_applicability": "Unspecified",
297307
"expansion": null
298308
},
299309
{
@@ -316,6 +326,7 @@ mod foo {
316326
"suggested_replacement": "use std::result::Iter;
317327

318328
",
329+
"suggestion_applicability": "Unspecified",
319330
"expansion": null
320331
},
321332
{
@@ -338,6 +349,7 @@ mod foo {
338349
"suggested_replacement": "use std::slice::Iter;
339350

340351
",
352+
"suggestion_applicability": "Unspecified",
341353
"expansion": null
342354
},
343355
{
@@ -360,6 +372,7 @@ mod foo {
360372
"suggested_replacement": "use std::sync::mpsc::Iter;
361373

362374
",
375+
"suggestion_applicability": "Unspecified",
363376
"expansion": null
364377
}
365378
],

0 commit comments

Comments
 (0)