Auto merge of #4809 - iankronquist:patch-1, r=flip1995

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

diff --git a/clippy_lints/src/cargo_common_metadata.rs b/clippy_lints/src/cargo_common_metadata.rs
index 380ad77e62fb1e3215923d1f34944860e4a0e391..ec53e08f50cd3a1edeb4bdb56496f44cb473d618 100644 (file)
--- a/clippy_lints/src/cargo_common_metadata.rs
+++ b/clippy_lints/src/cargo_common_metadata.rs
@@ -3,11 +3,10 @@
 use std::path::PathBuf;
 
 use crate::utils::span_lint;
-use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
-use rustc::{declare_lint_pass, declare_tool_lint};
-use syntax::{ast::*, source_map::DUMMY_SP};
-
-use cargo_metadata;
+use rustc_lint::{EarlyContext, EarlyLintPass};
+use rustc_session::{declare_lint_pass, declare_tool_lint};
+use rustc_span::source_map::DUMMY_SP;
+use syntax::ast::*;
 
 declare_clippy_lint! {
     /// **What it does:** Checks to see if all common metadata is defined in
@@ -55,7 +54,7 @@ fn is_empty_path(value: &Option<PathBuf>) -> bool {
 
 fn is_empty_vec(value: &[String]) -> bool {
     // This works because empty iterators return true
-    value.iter().all(std::string::String::is_empty)
+    value.iter().all(String::is_empty)
 }
 
 declare_lint_pass!(CargoCommonMetadata => [CARGO_COMMON_METADATA]);
@@ -86,7 +85,7 @@ fn check_crate(&mut self, cx: &EarlyContext<'_>, _: &Crate) {
                 missing_warning(cx, &package, "package.repository");
             }
 
-            if is_empty_str(&package.readme) {
+            if is_empty_path(&package.readme) {
                 missing_warning(cx, &package, "package.readme");
             }