mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make non_ascii_literal auto-fixable

Browse Source
This commit is contained in:
BO41 2019-05-20 15:23:38 +02:00
parent 874de889dc
commit 859b329603
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clippy_lints/src/unicode.rs
View File

@ -1,7 +1,8 @@
use crate::utils::{is_allowed, snippet, span_help_and_lint}; use crate::utils::{is_allowed, snippet, span_help_and_lint, span_lint_and_sugg};
use rustc::hir::*; use rustc::hir::*;
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
use rustc::{declare_lint_pass, declare_tool_lint}; use rustc::{declare_lint_pass, declare_tool_lint};
use rustc_errors::Applicability;
use syntax::ast::LitKind; use syntax::ast::LitKind;
use syntax::source_map::Span; use syntax::source_map::Span;
use unicode_normalization::UnicodeNormalization; use unicode_normalization::UnicodeNormalization;
@ -103,7 +104,7 @@ fn check_str(cx: &LateContext<'_, '_>, span: Span, id: HirId) {
); );
} }
if string.chars().any(|c| c as u32 > 0x7F) { if string.chars().any(|c| c as u32 > 0x7F) {
span_help_and_lint( span_lint_and_sugg(
cx, cx,
NON_ASCII_LITERAL, NON_ASCII_LITERAL,
span, span,
@ -116,6 +117,15 @@ fn check_str(cx: &LateContext<'_, '_>, span: Span, id: HirId) {
escape(string.nfc()) escape(string.nfc())
} }
), ),
format!(
"{}",
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) { if is_allowed(cx, NON_ASCII_LITERAL, id) && string.chars().zip(string.nfc()).any(|(a, b)| a != b) {