Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: elide needless lifetimes for rust 1.83.0 update to stable #587

Merged
merged 1 commit into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions rust/candid/src/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ macro_rules! primitive_impl {
};
}

impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
impl<'de> de::Deserializer<'de> for &mut Deserializer<'de> {
type Error = Error;
fn deserialize_any<V>(self, visitor: V) -> Result<V::Value>
where
Expand Down Expand Up @@ -1086,7 +1086,7 @@ impl<'a, 'de> Compound<'a, 'de> {
}
}

impl<'de, 'a> de::SeqAccess<'de> for Compound<'a, 'de> {
impl<'de> de::SeqAccess<'de> for Compound<'_, 'de> {
type Error = Error;

fn next_element_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>>
Expand Down Expand Up @@ -1138,7 +1138,7 @@ impl<'de, 'a> de::SeqAccess<'de> for Compound<'a, 'de> {
}
}

impl<'de, 'a> de::MapAccess<'de> for Compound<'a, 'de> {
impl<'de> de::MapAccess<'de> for Compound<'_, 'de> {
type Error = Error;
fn next_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>>
where
Expand Down Expand Up @@ -1239,7 +1239,7 @@ impl<'de, 'a> de::MapAccess<'de> for Compound<'a, 'de> {
}
}

impl<'de, 'a> de::EnumAccess<'de> for Compound<'a, 'de> {
impl<'de> de::EnumAccess<'de> for Compound<'_, 'de> {
type Error = Error;
type Variant = Self;

Expand Down Expand Up @@ -1273,7 +1273,7 @@ impl<'de, 'a> de::EnumAccess<'de> for Compound<'a, 'de> {
}
}

impl<'de, 'a> de::VariantAccess<'de> for Compound<'a, 'de> {
impl<'de> de::VariantAccess<'de> for Compound<'_, 'de> {
type Error = Error;

fn unit_variant(self) -> Result<()> {
Expand Down
2 changes: 1 addition & 1 deletion rust/candid/src/ser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ impl<'a> types::Serializer for &'a mut ValueSerializer {
pub struct Compound<'a> {
ser: &'a mut ValueSerializer,
}
impl<'a> types::Compound for Compound<'a> {
impl types::Compound for Compound<'_> {
type Error = Error;
fn serialize_element<T>(&mut self, value: &T) -> Result<()>
where
Expand Down
6 changes: 3 additions & 3 deletions rust/candid/src/types/impls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ where
}
}

impl<'a, T> CandidType for &'a T
impl<T> CandidType for &T
where
T: ?Sized + CandidType,
{
Expand All @@ -348,7 +348,7 @@ where
(**self).idl_serialize(serializer)
}
}
impl<'a, T> CandidType for &'a mut T
impl<T> CandidType for &mut T
where
T: ?Sized + CandidType,
{
Expand All @@ -366,7 +366,7 @@ where
}
}

impl<'a, T> CandidType for std::borrow::Cow<'a, T>
impl<T> CandidType for std::borrow::Cow<'_, T>
where
T: ?Sized + CandidType + ToOwned,
{
Expand Down
2 changes: 1 addition & 1 deletion rust/candid/src/types/number.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ impl<'de> Deserialize<'de> for Int {
D: serde::Deserializer<'de>,
{
struct IntVisitor;
impl<'de> Visitor<'de> for IntVisitor {
impl Visitor<'_> for IntVisitor {
type Value = Int;
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
formatter.write_str("Int value")
Expand Down
4 changes: 2 additions & 2 deletions rust/candid/src/types/reference.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl CandidType for Service {
/// A [`Visitor`] to extract [`Func`]s.
pub struct FuncVisitor;

impl<'de> Visitor<'de> for FuncVisitor {
impl Visitor<'_> for FuncVisitor {
type Value = Func;
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
formatter.write_str("Func value")
Expand Down Expand Up @@ -138,7 +138,7 @@ impl<'de> Deserialize<'de> for Service {
D: serde::Deserializer<'de>,
{
struct ServVisitor;
impl<'de> Visitor<'de> for ServVisitor {
impl Visitor<'_> for ServVisitor {
type Value = Service;
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
formatter.write_str("Service value")
Expand Down
2 changes: 1 addition & 1 deletion rust/candid/src/types/reserved.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ impl<'de> Deserialize<'de> for Empty {
D: serde::Deserializer<'de>,
{
struct EmptyVisitor;
impl<'de> Visitor<'de> for EmptyVisitor {
impl Visitor<'_> for EmptyVisitor {
type Value = Empty;
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
formatter.write_str("Cannot decode empty value")
Expand Down
2 changes: 1 addition & 1 deletion rust/candid_parser/src/bindings/rust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ fn path_to_var(path: &[TypePath]) -> String {
struct NominalState<'a> {
state: crate::configs::State<'a, BindingConfig>,
}
impl<'a> NominalState<'a> {
impl NominalState<'_> {
// Convert structural typing to nominal typing to fit Rust's type system
fn nominalize(&mut self, env: &mut TypeEnv, path: &mut Vec<TypePath>, t: &Type) -> Type {
let elem = StateElem::Type(t);
Expand Down
2 changes: 1 addition & 1 deletion rust/candid_parser/src/configs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ impl std::str::FromStr for Configs {
Ok(Configs(v))
}
}
impl<'a> std::fmt::Display for StateElem<'a> {
impl std::fmt::Display for StateElem<'_> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
match self {
StateElem::Type(t) => write!(f, "{}", path_name(t)),
Expand Down
2 changes: 1 addition & 1 deletion rust/candid_parser/src/random.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ impl ConfigState for GenConfig {
}

pub struct RandState<'a>(State<'a, GenConfig>);
impl<'a> RandState<'a> {
impl RandState<'_> {
pub fn any(&mut self, u: &mut Unstructured, ty: &Type) -> Result<IDLValue> {
let old_config = self.0.push_state(&StateElem::Type(ty));
if let Some(vec) = &self.0.config.value {
Expand Down
2 changes: 1 addition & 1 deletion rust/candid_parser/src/token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ pub fn error2<E: ToString>(err: E, span: Span) -> ParserError {
}
}

impl<'input> Iterator for Tokenizer<'input> {
impl Iterator for Tokenizer<'_> {
type Item = Result<(usize, Token, usize), LexicalError>;
fn next(&mut self) -> Option<Self::Item> {
let token = self.lex.next()?;
Expand Down
2 changes: 1 addition & 1 deletion rust/candid_parser/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub enum CandidSource<'a> {
Text(&'a str),
}

impl<'a> CandidSource<'a> {
impl CandidSource<'_> {
pub fn load(&self) -> Result<(TypeEnv, Option<Type>)> {
Ok(match self {
CandidSource::File(path) => pretty_check_file(path)?,
Expand Down
2 changes: 1 addition & 1 deletion rust/ic_principal/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ mod deserialize {
// as there's no need for it.
pub(super) struct PrincipalVisitor;

impl<'de> serde::de::Visitor<'de> for PrincipalVisitor {
impl serde::de::Visitor<'_> for PrincipalVisitor {
type Value = super::Principal;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down
Loading