Merge branch 'master' into 431-fix-display-raw-ident-generic

impl/Cargo.toml

@@ -26,7 +26,7 @@ proc-macro = true
 proc-macro2 = "1.0"
 quote = "1.0"
 syn = "2.0.45"
-convert_case = { version = "0.6", optional = true }
+convert_case = { version = "0.7", optional = true }
 unicode-xid = { version = "0.2.2", optional = true }
 
 [build-dependencies]

impl/src/fmt/display.rs

@@ -262,7 +262,7 @@ impl Expansion<'_> {
             .shared_attr
             .map_or(true, |attr| attr.contains_arg("_variant"));
         // If `shared_attr` is a transparent call to `_variant`, then we consider it being absent.
-        let has_shared_attr = self.shared_attr.map_or(false, |attr| {
+        let has_shared_attr = self.shared_attr.is_some_and(|attr| {
             attr.transparent_call().map_or(true, |(_, called_trait)| {
                 &called_trait != self.trait_ident || !shared_attr_contains_variant
             })

impl/src/fmt/mod.rs

@@ -297,7 +297,7 @@ impl FmtAttribute {
         fields.fmt_args_idents().filter_map(move |field_name| {
             (used_args.iter().any(|arg| field_name.unraw() == arg)
                 && !self.args.iter().any(|arg| {
-                    arg.alias.as_ref().map_or(false, |(n, _)| n == &field_name)
+                    arg.alias.as_ref().is_some_and(|(n, _)| n == &field_name)
                 }))
             .then(|| quote! { #field_name = *#field_name })
         })

impl/src/fmt/parsing.rs

@@ -522,7 +522,7 @@ fn identifier(input: &str) -> Option<(LeftToParse<'_>, Identifier<'_>)> {
             ),
             &mut and_then(char('_'), take_while1(check_char(XID::is_xid_continue))),
         ]),
-        |(i, _)| (i, &input[..(input.as_bytes().len() - i.as_bytes().len())]),
+        |(i, _)| (i, &input[..(input.len() - i.len())]),
     )(input)
 }
 
@@ -614,10 +614,7 @@ fn take_while0(
         while let Some(step) = parser(cur) {
             cur = step;
         }
-        (
-            cur,
-            &input[..(input.as_bytes().len() - cur.as_bytes().len())],
-        )
+        (cur, &input[..(input.len() - cur.len())])
     }
 }
 
@@ -631,10 +628,7 @@ fn take_while1(
         while let Some(step) = parser(cur) {
             cur = step;
         }
-        Some((
-            cur,
-            &input[..(input.as_bytes().len() - cur.as_bytes().len())],
-        ))
+        Some((cur, &input[..(input.len() - cur.len())]))
     }
 }
 
@@ -662,16 +656,13 @@ fn take_until1(
             cur = b;
         }
 
-        Some((
-            cur,
-            &input[..(input.as_bytes().len() - cur.as_bytes().len())],
-        ))
+        Some((cur, &input[..(input.len() - cur.len())]))
     }
 }
 
 /// Checks whether `input` starts with `s`.
 fn str(s: &str) -> impl FnMut(&str) -> Option<LeftToParse<'_>> + '_ {
-    move |input| input.starts_with(s).then(|| &input[s.as_bytes().len()..])
+    move |input| input.starts_with(s).then(|| &input[s.len()..])
 }
 
 /// Checks whether `input` starts with `c`.

impl/src/into.rs

@@ -576,7 +576,7 @@ where
             .filter(|(top_level, owned, ref_, ref_mut)| {
                 [top_level, owned, ref_, ref_mut]
                     .into_iter()
-                    .any(|l| l.as_ref().map_or(false, |l| !l.is_empty()))
+                    .any(|l| l.as_ref().is_some_and(|l| !l.is_empty()))
             })
         else {
             return Ok(());

impl/src/parsing.rs

@@ -73,7 +73,7 @@ impl Parse for Expr {
 
 impl PartialEq<syn::Ident> for Expr {
     fn eq(&self, other: &syn::Ident) -> bool {
-        self.ident().map_or(false, |i| i == other)
+        self.ident().is_some_and(|i| i == other)
     }
 }
 

impl/src/utils.rs

@@ -2329,7 +2329,7 @@ mod generics_search {
 
     impl<'ast> Visit<'ast> for Visitor<'_> {
         fn visit_type_path(&mut self, tp: &'ast syn::TypePath) {
-            self.found |= tp.path.get_ident().map_or(false, |ident| {
+            self.found |= tp.path.get_ident().is_some_and(|ident| {
                 self.search.types.contains(ident) || self.search.consts.contains(ident)
             });
 
@@ -2346,7 +2346,7 @@ mod generics_search {
             self.found |= ep
                 .path
                 .get_ident()
-                .map_or(false, |ident| self.search.consts.contains(ident));
+                .is_some_and(|ident| self.search.consts.contains(ident));
 
             syn::visit::visit_expr_path(self, ep)
         }

tests/compile_fail/debug/lifetime_no_debug.stderr

@@ -4,7 +4,7 @@ error[E0277]: `NoDebug<'_>` doesn't implement `Debug`
 5 | #[derive(derive_more::Debug)]
   |          ^^^^^^^^^^^^^^^^^^ `NoDebug<'_>` cannot be formatted using `{:?}`
   |
-  = help: the trait `Debug` is not implemented for `NoDebug<'_>`, which is required by `&NoDebug<'_>: Debug`
+  = help: the trait `Debug` is not implemented for `NoDebug<'_>`
   = note: add `#[derive(Debug)]` to `NoDebug<'_>` or manually `impl Debug for NoDebug<'_>`
   = note: required for `&NoDebug<'_>` to implement `Debug`
   = note: required for the cast from `&&NoDebug<'_>` to `&dyn Debug`

tests/compile_fail/debug/unclosed_brace.stderr

@@ -1,8 +1,8 @@
-error: invalid format string: expected `'}'`, found `')'`
+error: invalid format string: expected `}`, found `)`
  --> tests/compile_fail/debug/unclosed_brace.rs:3:21
   |
 3 |     #[debug("Stuff({)", bar)]
-  |                    -^ expected `'}'` in format string
+  |                    -^ expected `}` in format string
   |                    |
   |                    because of this opening brace
   |

tests/compile_fail/display/shared_format_unclosed_brace.stderr

@@ -1,8 +1,8 @@
-error: invalid format string: expected `'}'`, found `')'`
+error: invalid format string: expected `}`, found `)`
  --> tests/compile_fail/display/shared_format_unclosed_brace.rs:2:19
   |
 2 | #[display("Stuff({)")]
-  |                  -^ expected `'}'` in format string
+  |                  -^ expected `}` in format string
   |                  |
   |                  because of this opening brace
   |

tests/compile_fail/display/unclosed_brace.stderr

@@ -1,8 +1,8 @@
-error: invalid format string: expected `'}'`, found `')'`
+error: invalid format string: expected `}`, found `)`
  --> tests/compile_fail/display/unclosed_brace.rs:2:19
   |
 2 | #[display("Stuff({)", bar)]
-  |                  -^ expected `'}'` in format string
+  |                  -^ expected `}` in format string
   |                  |
   |                  because of this opening brace
   |