Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into roll-upstream-16
Browse files Browse the repository at this point in the history
  • Loading branch information
adetaylor committed Oct 16, 2024
2 parents 209b4db + faab2e8 commit 629cdad
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1491,7 +1491,7 @@ macro_rules! check_recursion {
};
}

impl<'de, 'a, R: Read<'de>> de::Deserializer<'de> for &'a mut Deserializer<R> {
impl<'de, R: Read<'de>> de::Deserializer<'de> for &mut Deserializer<R> {
type Error = Error;

#[inline]
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@
clippy::match_single_binding,
clippy::needless_doctest_main,
clippy::needless_late_init,
clippy::needless_lifetimes,
clippy::return_self_not_must_use,
clippy::transmute_ptr_to_ptr,
clippy::unconditional_recursion, // https://github.com/rust-lang/rust-clippy/issues/12133
Expand Down
4 changes: 2 additions & 2 deletions src/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ impl Hash for Map<String, Value> {
/// }
/// # ;
/// ```
impl<'a, Q> ops::Index<&'a Q> for Map<String, Value>
impl<Q> ops::Index<&Q> for Map<String, Value>
where
String: Borrow<Q>,
Q: ?Sized + Ord + Eq + Hash,
Expand All @@ -438,7 +438,7 @@ where
/// #
/// map["key"] = json!("value");
/// ```
impl<'a, Q> ops::IndexMut<&'a Q> for Map<String, Value>
impl<Q> ops::IndexMut<&Q> for Map<String, Value>
where
String: Borrow<Q>,
Q: ?Sized + Ord + Eq + Hash,
Expand Down
2 changes: 1 addition & 1 deletion src/number.rs
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ impl<'de> Deserializer<'de> for Number {
}
}

impl<'de, 'a> Deserializer<'de> for &'a Number {
impl<'de> Deserializer<'de> for &Number {
type Error = Error;

deserialize_any!(ref);
Expand Down
4 changes: 2 additions & 2 deletions src/read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1020,9 +1020,9 @@ impl<'a> Read<'a> for StrRead<'a> {

//////////////////////////////////////////////////////////////////////////////

impl<'a, 'de, R> private::Sealed for &'a mut R where R: Read<'de> {}
impl<'de, R> private::Sealed for &mut R where R: Read<'de> {}

impl<'a, 'de, R> Read<'de> for &'a mut R
impl<'de, R> Read<'de> for &mut R
where
R: Read<'de>,
{
Expand Down
2 changes: 1 addition & 1 deletion src/value/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ mod private {
impl Sealed for usize {}
impl Sealed for str {}
impl Sealed for alloc::string::String {}
impl<'a, T> Sealed for &'a T where T: ?Sized + Sealed {}
impl<T> Sealed for &T where T: ?Sized + Sealed {}
}

/// Used in panic messages.
Expand Down
2 changes: 2 additions & 0 deletions tests/regression.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(clippy::needless_lifetimes)]

mod regression {
automod::dir!("tests/regression");
}

0 comments on commit 629cdad

Please sign in to comment.