Merge branch 'master' into unnecessary_filter_map

Author: Michael Wright

.gitignore

@@ -15,7 +15,7 @@ out
 *.exe
 
 # Generated by Cargo
-Cargo.lock
+*Cargo.lock
 /target
 /clippy_lints/target
 /clippy_workspace_tests/target

clippy_dev/Cargo.lock

@@ -35,8 +35,8 @@ pub struct Lint {
 }
 
 impl Lint {
-    pub fn new(name: &str, group: &str, desc: &str, deprecation: Option<&str>, module: &str) -> Lint {
-        Lint {
+    pub fn new(name: &str, group: &str, desc: &str, deprecation: Option<&str>, module: &str) -> Self {
+        Self {
             name: name.to_lowercase(),
             group: group.to_string(),
             desc: NL_ESCAPE_RE.replace(&desc.replace("\\\"", "\""), "").to_string(),
@@ -46,12 +46,12 @@ impl Lint {
     }
 
     /// Returns all non-deprecated lints
-    pub fn active_lints(lints: &[Lint]) -> impl Iterator<Item=&Lint> {
+    pub fn active_lints(lints: &[Self]) -> impl Iterator<Item=&Self> {
         lints.iter().filter(|l| l.deprecation.is_none())
     }
 
     /// Returns the lints in a HashMap, grouped by the different lint groups
-    pub fn by_lint_group(lints: &[Lint]) -> HashMap<String, Vec<Lint>> {
+    pub fn by_lint_group(lints: &[Self]) -> HashMap<String, Vec<Self>> {
         lints.iter().map(|lint| (lint.group.to_string(), lint.clone())).into_group_map()
     }
 }

clippy_dev/src/lib.rs

@@ -123,11 +123,11 @@ impl Constant {
             (&Constant::Tuple(ref l), &Constant::Tuple(ref r)) | (&Constant::Vec(ref l), &Constant::Vec(ref r)) => l
                 .iter()
                 .zip(r.iter())
-                .map(|(li, ri)| Constant::partial_cmp(tcx, cmp_type, li, ri))
+                .map(|(li, ri)| Self::partial_cmp(tcx, cmp_type, li, ri))
                 .find(|r| r.map_or(true, |o| o != Ordering::Equal))
                 .unwrap_or_else(|| Some(l.len().cmp(&r.len()))),
             (&Constant::Repeat(ref lv, ref ls), &Constant::Repeat(ref rv, ref rs)) => {
-                match Constant::partial_cmp(tcx, cmp_type, lv, rv) {
+                match Self::partial_cmp(tcx, cmp_type, lv, rv) {
                     Some(Equal) => Some(ls.cmp(rs)),
                     x => x,
                 }

clippy_lints/src/consts.rs

@@ -46,9 +46,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for DurationSubsec {
             if let Some((Constant::Int(divisor), _)) = constant(cx, cx.tables, right);
             then {
                 let suggested_fn = match (method_path.ident.as_str().as_ref(), divisor) {
-                    ("subsec_micros", 1_000) => "subsec_millis",
+                    ("subsec_micros", 1_000) | ("subsec_nanos", 1_000_000) => "subsec_millis",
                     ("subsec_nanos", 1_000) => "subsec_micros",
-                    ("subsec_nanos", 1_000_000) => "subsec_millis",
                     _ => return,
                 };
                 span_lint_and_sugg(

clippy_lints/src/duration_subsec.rs

@@ -46,7 +46,7 @@ pub struct Pass {
 
 impl Default for Pass {
     fn default() -> Self {
-        Pass { impls: FxHashMap::default() }
+        Self { impls: FxHashMap::default() }
     }
 }
 

clippy_lints/src/inherent_impl.rs

@@ -1452,22 +1452,33 @@ fn lint_get_unwrap(cx: &LateContext<'_, '_>, expr: &hir::Expr, get_args: &[hir::
     // Note: we don't want to lint `get_mut().unwrap` for HashMap or BTreeMap,
     // because they do not implement `IndexMut`
     let expr_ty = cx.tables.expr_ty(&get_args[0]);
+    let get_args_str = if get_args.len() > 1 {
+        snippet(cx, get_args[1].span, "_")
+    } else {
+        return; // not linting on a .get().unwrap() chain or variant
+    };
+    let needs_ref;
     let caller_type = if derefs_to_slice(cx, &get_args[0], expr_ty).is_some() {
+        needs_ref = get_args_str.parse::<usize>().is_ok();
         "slice"
     } else if match_type(cx, expr_ty, &paths::VEC) {
+        needs_ref = get_args_str.parse::<usize>().is_ok();
         "Vec"
     } else if match_type(cx, expr_ty, &paths::VEC_DEQUE) {
+        needs_ref = get_args_str.parse::<usize>().is_ok();
         "VecDeque"
     } else if !is_mut && match_type(cx, expr_ty, &paths::HASHMAP) {
+        needs_ref = true;
         "HashMap"
     } else if !is_mut && match_type(cx, expr_ty, &paths::BTREEMAP) {
+        needs_ref = true;
         "BTreeMap"
     } else {
         return; // caller is not a type that we want to lint
     };
 
     let mut_str = if is_mut { "_mut" } else { "" };
-    let borrow_str = if is_mut { "&mut " } else { "&" };
+    let borrow_str = if !needs_ref { "" } else if is_mut { "&mut " } else { "&" };
     span_lint_and_sugg(
         cx,
         GET_UNWRAP,
@@ -1482,7 +1493,7 @@ fn lint_get_unwrap(cx: &LateContext<'_, '_>, expr: &hir::Expr, get_args: &[hir::
             "{}{}[{}]",
             borrow_str,
             snippet(cx, get_args[0].span, "_"),
-            snippet(cx, get_args[1].span, "_")
+            get_args_str
         ),
     );
 }

clippy_lints/src/methods/mod.rs

@@ -41,18 +41,17 @@ impl LintPass for Pass {
 
 impl EarlyLintPass for Pass {
     fn check_crate(&mut self, cx: &EarlyContext<'_>, krate: &Crate) {
-        let metadata = match cargo_metadata::metadata_deps(None, true) {
-            Ok(metadata) => metadata,
-            Err(_) => {
-                span_lint(
-                    cx,
-                    MULTIPLE_CRATE_VERSIONS,
-                    krate.span,
-                    "could not read cargo metadata"
-                );
+        let metadata = if let Ok(metadata) = cargo_metadata::metadata_deps(None, true) {
+            metadata
+        } else {
+            span_lint(
+                cx,
+                MULTIPLE_CRATE_VERSIONS,
+                krate.span,
+                "could not read cargo metadata"
+            );
 
-                return;
-            }
+            return;
         };
 
         let mut packages = metadata.packages;

clippy_lints/src/multiple_crate_versions.rs

@@ -148,7 +148,7 @@ define_Conf! {
 }
 
 impl Default for Conf {
-    fn default() -> Conf {
+    fn default() -> Self {
         toml::from_str("").expect("we never error on empty config files")
     }
 }

clippy_lints/src/utils/conf.rs

@@ -43,4 +43,9 @@ fn main() {
         *some_btreemap.get_mut(&1).unwrap() = 'b';
         *false_positive.get_mut(0).unwrap() = 1;
     }
+
+    { // Test `get().unwrap().foo()` and `get_mut().unwrap().bar()`
+        let _ = some_vec.get(0..1).unwrap().to_vec();
+        let _ = some_vec.get_mut(0..1).unwrap().to_vec();
+    }
 }