-use crate::utils::{is_allowed, snippet, span_help_and_lint};
+use crate::utils::{is_allowed, snippet, span_lint_and_sugg};
use rustc::hir::*;
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
use rustc::{declare_lint_pass, declare_tool_lint};
+use rustc_errors::Applicability;
use syntax::ast::LitKind;
use syntax::source_map::Span;
use unicode_normalization::UnicodeNormalization;
///
/// **Example:**
/// ```rust
- /// let x = "Hä?"
+ /// let x = String::from("€");
+ /// ```
+ /// Could be written as:
+ /// ```rust
+ /// let x = String::from("\u{20ac}");
/// ```
pub NON_ASCII_LITERAL,
pedantic,
///
/// **Known problems** None.
///
- /// **Example:** You may not see it, but “à” and “à” aren't the same string. The
+ /// **Example:** You may not see it, but "à"" and "à"" aren't the same string. The
/// former when escaped is actually `"a\u{300}"` while the latter is `"\u{e0}"`.
pub UNICODE_NOT_NFC,
pedantic,
- "using a unicode literal not in NFC normal form (see [unicode tr15](http://www.unicode.org/reports/tr15/) for further information)"
+ "using a Unicode literal not in NFC normal form (see [Unicode tr15](http://www.unicode.org/reports/tr15/) for further information)"
}
declare_lint_pass!(Unicode => [ZERO_WIDTH_SPACE, NON_ASCII_LITERAL, UNICODE_NOT_NFC]);
-impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Unicode {
- fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
+impl LateLintPass<'_, '_> for Unicode {
+ fn check_expr(&mut self, cx: &LateContext<'_, '_>, expr: &'_ Expr) {
if let ExprKind::Lit(ref lit) = expr.node {
if let LitKind::Str(_, _) = lit.node {
check_str(cx, lit.span, expr.hir_id)
fn check_str(cx: &LateContext<'_, '_>, span: Span, id: HirId) {
let string = snippet(cx, span, "");
if string.contains('\u{200B}') {
- span_help_and_lint(
+ span_lint_and_sugg(
cx,
ZERO_WIDTH_SPACE,
span,
"zero-width space detected",
- &format!(
- "Consider replacing the string with:\n\"{}\"",
- string.replace("\u{200B}", "\\u{200B}")
- ),
+ "consider replacing the string with",
+ string.replace("\u{200B}", "\\u{200B}"),
+ Applicability::MachineApplicable,
);
}
if string.chars().any(|c| c as u32 > 0x7F) {
- span_help_and_lint(
+ span_lint_and_sugg(
cx,
NON_ASCII_LITERAL,
span,
"literal non-ASCII character detected",
- &format!(
- "Consider replacing the string with:\n\"{}\"",
- if is_allowed(cx, UNICODE_NOT_NFC, id) {
- escape(string.chars())
- } else {
- escape(string.nfc())
- }
- ),
+ "consider replacing the string with",
+ if is_allowed(cx, UNICODE_NOT_NFC, id) {
+ escape(string.chars())
+ } else {
+ escape(string.nfc())
+ },
+ Applicability::MachineApplicable,
);
}
if is_allowed(cx, NON_ASCII_LITERAL, id) && string.chars().zip(string.nfc()).any(|(a, b)| a != b) {
- span_help_and_lint(
+ span_lint_and_sugg(
cx,
UNICODE_NOT_NFC,
span,
- "non-nfc unicode sequence detected",
- &format!(
- "Consider replacing the string with:\n\"{}\"",
- string.nfc().collect::<String>()
- ),
+ "non-NFC Unicode sequence detected",
+ "consider replacing the string with",
+ string.nfc().collect::<String>(),
+ Applicability::MachineApplicable,
);
}
}