rustup https://github.com/rust-lang/rust/pull/67455

[rust.git] / clippy_lints / src / unsafe_removed_from_name.rs

diff --git a/clippy_lints/src/unsafe_removed_from_name.rs b/clippy_lints/src/unsafe_removed_from_name.rs
index 488ca5c8a62bda88f9faff6c7d72face032b25d2..58af6e9d28146491235055263dd67176c6093937 100644 (file)
--- a/clippy_lints/src/unsafe_removed_from_name.rs
+++ b/clippy_lints/src/unsafe_removed_from_name.rs
@@ -1,82 +1,79 @@
-use rustc::hir::*;
-use rustc::lint::*;
-use syntax::ast::Name;
-use syntax::codemap::Span;
-use syntax::parse::token::InternedString;
-use utils::span_lint;
+use crate::utils::span_lint;
+use rustc::declare_lint_pass;
+use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
+use rustc_session::declare_tool_lint;
+use syntax::ast::*;
+use syntax::source_map::Span;
+use syntax::symbol::SymbolStr;
 
-/// **What it does:** Checks for imports that remove "unsafe" from an item's
-/// name.
-///
-/// **Why is this bad?** Renaming makes it less clear which traits and
-/// structures are unsafe.
-///
-/// **Known problems:** None.
-///
-/// **Example:**
-/// ```rust,ignore
-/// use std::cell::{UnsafeCell as TotallySafeCell};
-///
-/// extern crate crossbeam;
-/// use crossbeam::{spawn_unsafe as spawn};
-/// ```
-declare_lint! {
+declare_clippy_lint! {
+    /// **What it does:** Checks for imports that remove "unsafe" from an item's
+    /// name.
+    ///
+    /// **Why is this bad?** Renaming makes it less clear which traits and
+    /// structures are unsafe.
+    ///
+    /// **Known problems:** None.
+    ///
+    /// **Example:**
+    /// ```rust,ignore
+    /// use std::cell::{UnsafeCell as TotallySafeCell};
+    ///
+    /// extern crate crossbeam;
+    /// use crossbeam::{spawn_unsafe as spawn};
+    /// ```
     pub UNSAFE_REMOVED_FROM_NAME,
-    Warn,
+    style,
     "`unsafe` removed from API names on import"
 }
 
-pub struct UnsafeNameRemoval;
+declare_lint_pass!(UnsafeNameRemoval => [UNSAFE_REMOVED_FROM_NAME]);
 
-impl LintPass for UnsafeNameRemoval {
-    fn get_lints(&self) -> LintArray {
-        lint_array!(UNSAFE_REMOVED_FROM_NAME)
+impl EarlyLintPass for UnsafeNameRemoval {
+    fn check_item(&mut self, cx: &EarlyContext<'_>, item: &Item) {
+        if let ItemKind::Use(ref use_tree) = item.kind {
+            check_use_tree(use_tree, cx, item.span);
+        }
     }
 }
 
-impl LateLintPass for UnsafeNameRemoval {
-    fn check_item(&mut self, cx: &LateContext, item: &Item) {
-        if let ItemUse(ref item_use) = item.node {
-            match item_use.node {
-                ViewPath_::ViewPathSimple(ref name, ref path) => {
-                    unsafe_to_safe_check(
-                        path.segments
-                            .last()
-                            .expect("use paths cannot be empty")
-                            .name,
-                        *name,
-                        cx, &item.span
-                        );
-                }
-                ViewPath_::ViewPathList(_, ref path_list_items) => {
-                    for path_list_item in path_list_items.iter() {
-                        let plid = path_list_item.node;
-                        if let Some(rename) = plid.rename {
-                            unsafe_to_safe_check(plid.name, rename, cx, &item.span);
-                        };
-                    }
-                }
-                ViewPath_::ViewPathGlob(_) => {}
+fn check_use_tree(use_tree: &UseTree, cx: &EarlyContext<'_>, span: Span) {
+    match use_tree.kind {
+        UseTreeKind::Simple(Some(new_name), ..) => {
+            let old_name = use_tree
+                .prefix
+                .segments
+                .last()
+                .expect("use paths cannot be empty")
+                .ident;
+            unsafe_to_safe_check(old_name, new_name, cx, span);
+        },
+        UseTreeKind::Simple(None, ..) | UseTreeKind::Glob => {},
+        UseTreeKind::Nested(ref nested_use_tree) => {
+            for &(ref use_tree, _) in nested_use_tree {
+                check_use_tree(use_tree, cx, span);
             }
-        }
+        },
     }
 }
 
-fn unsafe_to_safe_check(old_name: Name, new_name: Name, cx: &LateContext, span: &Span) {
-    let old_str = old_name.as_str();
-    let new_str = new_name.as_str();
+fn unsafe_to_safe_check(old_name: Ident, new_name: Ident, cx: &EarlyContext<'_>, span: Span) {
+    let old_str = old_name.name.as_str();
+    let new_str = new_name.name.as_str();
     if contains_unsafe(&old_str) && !contains_unsafe(&new_str) {
-        span_lint(cx,
-                  UNSAFE_REMOVED_FROM_NAME,
-                  *span,
-                  &format!(
+        span_lint(
+            cx,
+            UNSAFE_REMOVED_FROM_NAME,
+            span,
+            &format!(
                 "removed \"unsafe\" from the name of `{}` in use as `{}`",
-                old_str,
-                new_str
-            ));
+                old_str, new_str
+            ),
+        );
     }
 }
 
-fn contains_unsafe(name: &InternedString) -> bool {
+#[must_use]
+fn contains_unsafe(name: &SymbolStr) -> bool {
     name.contains("Unsafe") || name.contains("unsafe")
 }