remove `_with_applicability` from suggestion fns

2 files changed, 57 insertions, 156 deletions

diff --git a/src/librustc_errors/diagnostic.rs b/src/librustc_errors/diagnostic.rs
index 3fa391c84ab..06a1761a1e7 100644
--- a/src/librustc_errors/diagnostic.rs
+++ b/src/librustc_errors/diagnostic.rs
@@ -229,59 +229,7 @@ impl Diagnostic {
         self
     }
 
-    /// Prints out a message with a suggested edit of the code. If the suggestion is presented
-    /// inline it will only show the text message and not the text.
-    ///
-    /// See `CodeSuggestion` for more information.
-    #[deprecated(note = "Use `span_suggestion_short_with_applicability`")]
-    pub fn span_suggestion_short(&mut self, sp: Span, msg: &str, suggestion: String) -> &mut Self {
-        self.suggestions.push(CodeSuggestion {
-            substitutions: vec![Substitution {
-                parts: vec![SubstitutionPart {
-                    snippet: suggestion,
-                    span: sp,
-                }],
-            }],
-            msg: msg.to_owned(),
-            show_code_when_inline: false,
-            applicability: Applicability::Unspecified,
-        });
-        self
-    }
-
-    /// Prints out a message with a suggested edit of the code.
-    ///
-    /// In case of short messages and a simple suggestion,
-    /// rustc displays it as a label like
-    ///
-    /// "try adding parentheses: `(tup.0).1`"
-    ///
-    /// The message
-    ///
-    /// * should not end in any punctuation (a `:` is added automatically)
-    /// * should not be a question
-    /// * should not contain any parts like "the following", "as shown"
-    /// * may look like "to do xyz, use" or "to do xyz, use abc"
-    /// * may contain a name of a function, variable or type, but not whole expressions
-    ///
-    /// See `CodeSuggestion` for more information.
-    #[deprecated(note = "Use `span_suggestion_with_applicability`")]
-    pub fn span_suggestion(&mut self, sp: Span, msg: &str, suggestion: String) -> &mut Self {
-        self.suggestions.push(CodeSuggestion {
-            substitutions: vec![Substitution {
-                parts: vec![SubstitutionPart {
-                    snippet: suggestion,
-                    span: sp,
-                }],
-            }],
-            msg: msg.to_owned(),
-            show_code_when_inline: true,
-            applicability: Applicability::Unspecified,
-        });
-        self
-    }
-
-    pub fn multipart_suggestion_with_applicability(
+    pub fn multipart_suggestion(
         &mut self,
         msg: &str,
         suggestion: Vec<(Span, String)>,
@@ -301,39 +249,24 @@ impl Diagnostic {
         self
     }
 
-    #[deprecated(note = "Use `multipart_suggestion_with_applicability`")]
-    pub fn multipart_suggestion(
-        &mut self,
-        msg: &str,
-        suggestion: Vec<(Span, String)>,
-    ) -> &mut Self {
-        self.multipart_suggestion_with_applicability(
-            msg,
-            suggestion,
-            Applicability::Unspecified,
-        )
-    }
-
-    /// Prints out a message with multiple suggested edits of the code.
-    #[deprecated(note = "Use `span_suggestions_with_applicability`")]
-    pub fn span_suggestions(&mut self, sp: Span, msg: &str, suggestions: Vec<String>) -> &mut Self {
-        self.suggestions.push(CodeSuggestion {
-            substitutions: suggestions.into_iter().map(|snippet| Substitution {
-                parts: vec![SubstitutionPart {
-                    snippet,
-                    span: sp,
-                }],
-            }).collect(),
-            msg: msg.to_owned(),
-            show_code_when_inline: true,
-            applicability: Applicability::Unspecified,
-        });
-        self
-    }
-
-    /// This is a suggestion that may contain mistakes or fillers and should
-    /// be read and understood by a human.
-    pub fn span_suggestion_with_applicability(&mut self, sp: Span, msg: &str,
+    /// Prints out a message with a suggested edit of the code.
+    ///
+    /// In case of short messages and a simple suggestion, rustc displays it as a label:
+    ///
+    /// ```text
+    /// try adding parentheses: `(tup.0).1`
+    /// ```
+    ///
+    /// The message
+    ///
+    /// * should not end in any punctuation (a `:` is added automatically)
+    /// * should not be a question (avoid language like "did you mean")
+    /// * should not contain any phrases like "the following", "as shown", etc.
+    /// * may look like "to do xyz, use" or "to do xyz, use abc"
+    /// * may contain a name of a function, variable, or type, but not whole expressions
+    ///
+    /// See `CodeSuggestion` for more information.
+    pub fn span_suggestion(&mut self, sp: Span, msg: &str,
                                        suggestion: String,
                                        applicability: Applicability) -> &mut Self {
         self.suggestions.push(CodeSuggestion {
@@ -350,7 +283,8 @@ impl Diagnostic {
         self
     }
 
-    pub fn span_suggestions_with_applicability(&mut self, sp: Span, msg: &str,
+    /// Prints out a message with multiple suggested edits of the code.
+    pub fn span_suggestions(&mut self, sp: Span, msg: &str,
         suggestions: impl Iterator<Item = String>, applicability: Applicability) -> &mut Self
     {
         self.suggestions.push(CodeSuggestion {
@@ -367,7 +301,11 @@ impl Diagnostic {
         self
     }
 
-    pub fn span_suggestion_short_with_applicability(
+    /// Prints out a message with a suggested edit of the code. If the suggestion is presented
+    /// inline, it will only show the message and not the suggestion.
+    ///
+    /// See `CodeSuggestion` for more information.
+    pub fn span_suggestion_short(
         &mut self, sp: Span, msg: &str, suggestion: String, applicability: Applicability
     ) -> &mut Self {
         self.suggestions.push(CodeSuggestion {
diff --git a/src/librustc_errors/diagnostic_builder.rs b/src/librustc_errors/diagnostic_builder.rs
index 736cca6bd64..f423a4cd1a7 100644
--- a/src/librustc_errors/diagnostic_builder.rs
+++ b/src/librustc_errors/diagnostic_builder.rs
@@ -39,7 +39,6 @@ macro_rules! forward {
     ) => {
         $(#[$attrs])*
         pub fn $n(&self, $($name: $ty),*) -> &Self {
-            #[allow(deprecated)]
             self.diagnostic.$n($($name),*);
             self
         }
@@ -52,7 +51,6 @@ macro_rules! forward {
     ) => {
         $(#[$attrs])*
         pub fn $n(&mut self, $($name: $ty),*) -> &mut Self {
-            #[allow(deprecated)]
             self.diagnostic.$n($($name),*);
             self
         }
@@ -70,7 +68,6 @@ macro_rules! forward {
     ) => {
         $(#[$attrs])*
         pub fn $n<S: Into<MultiSpan>>(&mut self, $($name: $ty),*) -> &mut Self {
-            #[allow(deprecated)]
             self.diagnostic.$n($($name),*);
             self
         }
@@ -190,53 +187,16 @@ impl<'a> DiagnosticBuilder<'a> {
                                                   msg: &str,
                                                   ) -> &mut Self);
 
-    forward!(
-        #[deprecated(note = "Use `span_suggestion_short_with_applicability`")]
-        pub fn span_suggestion_short(
-            &mut self,
-            sp: Span,
-            msg: &str,
-            suggestion: String,
-        ) -> &mut Self
-    );
-
-    forward!(
-        #[deprecated(note = "Use `multipart_suggestion_with_applicability`")]
-        pub fn multipart_suggestion(
-            &mut self,
-            msg: &str,
-            suggestion: Vec<(Span, String)>,
-        ) -> &mut Self
-    );
-
-    forward!(
-        #[deprecated(note = "Use `span_suggestion_with_applicability`")]
-        pub fn span_suggestion(
-            &mut self,
-            sp: Span,
-            msg: &str,
-            suggestion: String,
-        ) -> &mut Self
-    );
-
-    forward!(
-        #[deprecated(note = "Use `span_suggestions_with_applicability`")]
-        pub fn span_suggestions(&mut self,
-            sp: Span,
-            msg: &str,
-            suggestions: Vec<String>,
-        ) -> &mut Self
-    );
-
-    pub fn multipart_suggestion_with_applicability(&mut self,
-                                              msg: &str,
-                                              suggestion: Vec<(Span, String)>,
-                                              applicability: Applicability,
-                                              ) -> &mut Self {
+    pub fn multipart_suggestion(
+        &mut self,
+        msg: &str,
+        suggestion: Vec<(Span, String)>,
+        applicability: Applicability,
+    ) -> &mut Self {
         if !self.allow_suggestions {
             return self
         }
-        self.diagnostic.multipart_suggestion_with_applicability(
+        self.diagnostic.multipart_suggestion(
             msg,
             suggestion,
             applicability,
@@ -244,16 +204,17 @@ impl<'a> DiagnosticBuilder<'a> {
         self
     }
 
-    pub fn span_suggestion_with_applicability(&mut self,
-                                              sp: Span,
-                                              msg: &str,
-                                              suggestion: String,
-                                              applicability: Applicability)
-                                              -> &mut Self {
+    pub fn span_suggestion(
+        &mut self,
+        sp: Span,
+        msg: &str,
+        suggestion: String,
+        applicability: Applicability,
+    ) -> &mut Self {
         if !self.allow_suggestions {
             return self
         }
-        self.diagnostic.span_suggestion_with_applicability(
+        self.diagnostic.span_suggestion(
             sp,
             msg,
             suggestion,
@@ -262,16 +223,17 @@ impl<'a> DiagnosticBuilder<'a> {
         self
     }
 
-    pub fn span_suggestions_with_applicability(&mut self,
-                                               sp: Span,
-                                               msg: &str,
-                                               suggestions: impl Iterator<Item = String>,
-                                               applicability: Applicability)
-                                               -> &mut Self {
+    pub fn span_suggestions(
+        &mut self,
+        sp: Span,
+        msg: &str,
+        suggestions: impl Iterator<Item = String>,
+        applicability: Applicability,
+    ) -> &mut Self {
         if !self.allow_suggestions {
             return self
         }
-        self.diagnostic.span_suggestions_with_applicability(
+        self.diagnostic.span_suggestions(
             sp,
             msg,
             suggestions,
@@ -280,16 +242,17 @@ impl<'a> DiagnosticBuilder<'a> {
         self
     }
 
-    pub fn span_suggestion_short_with_applicability(&mut self,
-                                                    sp: Span,
-                                                    msg: &str,
-                                                    suggestion: String,
-                                                    applicability: Applicability)
-                                                    -> &mut Self {
+    pub fn span_suggestion_short(
+        &mut self,
+        sp: Span,
+        msg: &str,
+        suggestion: String,
+        applicability: Applicability,
+    ) -> &mut Self {
         if !self.allow_suggestions {
             return self
         }
-        self.diagnostic.span_suggestion_short_with_applicability(
+        self.diagnostic.span_suggestion_short(
             sp,
             msg,
             suggestion,