Merge branch 'main' into write-sparse-index (upgrade to Rust 1.65)

Author: Byron

cargo-smart-release/src/bat.rs

@@ -33,7 +33,7 @@ impl Support {
             return Ok(());
         }
         if Command::new("bat")
-            .args(&["--paging=always", "-l=md", "--file-name"])
+            .args(["--paging=always", "-l=md", "--file-name"])
             .arg(format!("{} ({})", path_for_title.display(), additional_title.as_ref()))
             .arg(path)
             .status()?

cargo-smart-release/src/changelog/mod.rs

@@ -108,7 +108,7 @@ impl Section {
                     return false;
                 };
                 segments.iter().any(
-                    |s| matches!(s, section::Segment::Conventional(section::segment::Conventional {kind, removed, is_breaking, ..}) if *is_breaking && removed.is_empty() && as_headline(*kind).is_none()),
+                    |s| matches!(s, section::Segment::Conventional(section::segment::Conventional {kind, removed, is_breaking, ..}) if *is_breaking && removed.is_empty() && as_headline(kind).is_none()),
                 )
             }
         }

cargo-smart-release/src/changelog/parse.rs

@@ -246,7 +246,7 @@ fn parse_conventional_to_next_section_title(
     ]
     .iter()
     .find(|kind| {
-        let headline = section::segment::conventional::as_headline(*kind).unwrap_or(*kind);
+        let headline = section::segment::conventional::as_headline(kind).unwrap_or(*kind);
         let common_len = headline.len().min(title.len());
         title
             .get(..common_len)
@@ -256,7 +256,7 @@ fn parse_conventional_to_next_section_title(
     .expect("BUG: this list needs an update too if new kinds of conventional messages are added");
 
     let mut conventional = section::segment::Conventional {
-        kind: *kind,
+        kind,
         is_breaking,
         removed: vec![],
         messages: vec![],

cargo-smart-release/src/command/release/manifest.rs

@@ -340,7 +340,7 @@ fn generate_commit_message(
         match (
             pending_changelogs.len(),
             pending_changelogs.iter().fold(0usize, |mut acc, (_, _, lock)| {
-                acc += if !lock.resource_path().is_file() { 1 } else { 0 };
+                acc += usize::from(!lock.resource_path().is_file());
                 acc
             })
         ) {

cargo-smart-release/src/command/release/mod.rs

@@ -416,7 +416,7 @@ fn perform_release(ctx: &Context, options: Options, crates: &[traverse::Dependen
     let prevent_default_members = ctx.base.meta.workspace_members.len() > 1;
     for (publishee, new_version) in crates.iter().filter_map(try_to_published_crate_and_new_version) {
         if let Some((crate_, version)) = successful_publishees_and_version.last() {
-            if let Err(err) = wait_for_release(*crate_, version, options) {
+            if let Err(err) = wait_for_release(crate_, version, options) {
                 log::warn!(
                     "Failed to wait for crates-index update - trying to publish '{} v{}' anyway: {}.",
                     publishee.name,

git-config-value/tests/value/boolean.rs

@@ -30,7 +30,7 @@ fn ignores_case() {
     // Random subset
     for word in &["no", "yes", "on", "off", "true", "false"] {
         let first: bool = Boolean::try_from(b(word)).unwrap().into();
-        let second: bool = Boolean::try_from(b(&*word.to_uppercase())).unwrap().into();
+        let second: bool = Boolean::try_from(b(&word.to_uppercase())).unwrap().into();
         assert_eq!(first, second);
     }
 }

git-config/src/file/access/read_only.rs

@@ -264,7 +264,7 @@ impl<'event> File<'event> {
     ///
     /// This is the metadata the file was instantiated with for use in all newly created sections.
     pub fn meta(&self) -> &Metadata {
-        &*self.meta
+        &self.meta
     }
 
     /// Similar to [`meta()`][File::meta()], but with shared ownership.

git-config/tests/file/mod.rs

@@ -8,10 +8,11 @@ pub fn cow_str(s: &str) -> Cow<'_, BStr> {
 
 #[test]
 fn size_in_memory() {
-    assert_eq!(
-        std::mem::size_of::<git_config::File<'_>>(),
-        1040,
-        "This shouldn't change without us noticing"
+    let actual = std::mem::size_of::<git_config::File<'_>>();
+    assert!(
+        actual <= 1040,
+        "{} <= 1040: This shouldn't change without us noticing",
+        actual
     );
 }
 

git-config/tests/parse/mod.rs

@@ -9,20 +9,23 @@ mod section;
 
 #[test]
 fn size_in_memory() {
-    assert_eq!(
-        std::mem::size_of::<Section<'_>>(),
-        6768,
-        "This shouldn't change without us noticing"
+    let actual = std::mem::size_of::<Section<'_>>();
+    assert!(
+        actual <= 6768,
+        "{} <= 6768: This shouldn't change without us noticing",
+        actual
     );
-    assert_eq!(
-        std::mem::size_of::<Event<'_>>(),
-        104,
-        "This shouldn't change without us noticing"
+    let actual = std::mem::size_of::<Event<'_>>();
+    assert!(
+        actual <= 104,
+        "{} <= 104: This shouldn't change without us noticing",
+        actual
     );
-    assert_eq!(
-        std::mem::size_of::<Events<'_>>(),
-        872,
-        "This shouldn't change without us noticing"
+    let actual = std::mem::size_of::<Events<'_>>();
+    assert!(
+        actual <= 872,
+        "{} <= 872: This shouldn't change without us noticing",
+        actual
     );
 }
 

git-config/tests/value/normalize.rs

@@ -42,14 +42,14 @@ fn all_quote_optimization_is_correct() {
 #[test]
 fn quotes_right_next_to_each_other() {
     let cow = normalize_bstr("\"hello\"\" world\"");
-    assert_eq!(cow, cow_str("hello world").to_owned());
+    assert_eq!(cow, cow_str("hello world").clone());
     assert!(matches!(cow, Cow::Owned(_)));
 }
 
 #[test]
 fn escaped_quotes_are_kept() {
     let cow = normalize_bstr(r#""hello \"\" world""#);
-    assert_eq!(cow, cow_str("hello \"\" world").to_owned(),);
+    assert_eq!(cow, cow_str("hello \"\" world").clone(),);
     assert!(matches!(cow, Cow::Owned(_)));
 }