4 files changed, 4 insertions, 22 deletions
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index e0c0fdd2a01..960bbfdd1ef 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -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:
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index 6c8d4f5669e..8df66d8d688 100644
--- a/src/librustc/session/mod.rs
+++ b/src/librustc/session/mod.rs
@@ -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(
@@ -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(
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 90889890e0b..458ed105d26 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -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)
             )
         },
diff --git a/src/libsyntax/json.rs b/src/libsyntax/json.rs
index 2f15e75093b..f129aea32b8 100644
--- a/src/libsyntax/json.rs
+++ b/src/libsyntax/json.rs
@@ -38,22 +38,18 @@ 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,
         }
     }
@@ -61,20 +57,18 @@ impl JsonEmitter {
     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,
         }
     }
@@ -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>>,
@@ -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,
@@ -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,
         }