diff --git a/Cargo.toml b/Cargo.toml index c5ff1d0..ad01ed8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ authors = [ license = "MIT OR Apache-2.0" repository = "https://github.com/domenicquirl/cstree" readme = "README.md" -rust-version = "1.71" +rust-version = "1.84" [profile.release] debug = true diff --git a/cstree-derive/src/symbols.rs b/cstree-derive/src/symbols.rs index ac2abe0..c00ce8d 100644 --- a/cstree-derive/src/symbols.rs +++ b/cstree-derive/src/symbols.rs @@ -20,7 +20,7 @@ impl PartialEq for Ident { } } -impl<'a> PartialEq for &'a Ident { +impl PartialEq for &Ident { fn eq(&self, word: &Symbol) -> bool { *self == word.0 } @@ -32,7 +32,7 @@ impl PartialEq for Path { } } -impl<'a> PartialEq for &'a Path { +impl PartialEq for &Path { fn eq(&self, word: &Symbol) -> bool { self.is_ident(word.0) } diff --git a/cstree/Cargo.toml b/cstree/Cargo.toml index 08cc158..78192d4 100644 --- a/cstree/Cargo.toml +++ b/cstree/Cargo.toml @@ -18,7 +18,6 @@ parking_lot = "0.12.1" # Arc triomphe = { version = "0.1.8", default-features = false, features = ["stable_deref_trait", "std"] } -sptr = "0.3.2" # Default Interner indexmap = "2.4.0" diff --git a/cstree/src/green/element.rs b/cstree/src/green/element.rs index 6387b35..00344b3 100644 --- a/cstree/src/green/element.rs +++ b/cstree/src/green/element.rs @@ -4,8 +4,6 @@ use std::{fmt, hash, mem}; // This MUST be size=1 such that pointer math actually advances the pointer. type ErasedPtr = *const u8; -use sptr::Strict; - use crate::{ green::{GreenNode, GreenToken}, text::TextSize, diff --git a/cstree/src/green/iter.rs b/cstree/src/green/iter.rs index d4e32d9..da4acad 100644 --- a/cstree/src/green/iter.rs +++ b/cstree/src/green/iter.rs @@ -65,7 +65,7 @@ impl<'a> Iterator for GreenNodeChildren<'a> { } } -impl<'a> DoubleEndedIterator for GreenNodeChildren<'a> { +impl DoubleEndedIterator for GreenNodeChildren<'_> { #[inline] fn next_back(&mut self) -> Option { self.inner.next_back().map(PackedGreenElement::as_ref) diff --git a/cstree/src/green/token.rs b/cstree/src/green/token.rs index d5543c1..bd7a9cf 100644 --- a/cstree/src/green/token.rs +++ b/cstree/src/green/token.rs @@ -5,7 +5,6 @@ use crate::{ text::TextSize, RawSyntaxKind, }; -use sptr::Strict; use triomphe::Arc; #[repr(align(2))] // to use 1 bit for pointer tagging. NB: this is an at-least annotation diff --git a/cstree/src/syntax/element.rs b/cstree/src/syntax/element.rs index 4602f65..bef407a 100644 --- a/cstree/src/syntax/element.rs +++ b/cstree/src/syntax/element.rs @@ -103,7 +103,7 @@ impl<'a, S: Syntax, D> From<&'a SyntaxElement> for SyntaxElementRef<'a, S, } } -impl<'a, S: Syntax, D> SyntaxElementRef<'a, S, D> { +impl SyntaxElementRef<'_, S, D> { /// Returns this element's [`Display`](fmt::Display) representation as a string. /// /// To avoid allocating for every element, see [`write_display`](type.SyntaxElementRef.html#method.write_display). diff --git a/cstree/src/syntax/iter.rs b/cstree/src/syntax/iter.rs index d742582..74926d8 100644 --- a/cstree/src/syntax/iter.rs +++ b/cstree/src/syntax/iter.rs @@ -57,13 +57,13 @@ impl<'n> Iterator for Iter<'n> { } } -impl<'n> ExactSizeIterator for Iter<'n> { +impl ExactSizeIterator for Iter<'_> { #[inline(always)] fn len(&self) -> usize { self.green.len() } } -impl<'n> FusedIterator for Iter<'n> {} +impl FusedIterator for Iter<'_> {} /// An iterator over the child nodes of a [`SyntaxNode`]. #[derive(Clone, Debug)] @@ -109,13 +109,13 @@ impl<'n, S: Syntax, D> Iterator for SyntaxNodeChildren<'n, S, D> { } } -impl<'n, S: Syntax, D> ExactSizeIterator for SyntaxNodeChildren<'n, S, D> { +impl ExactSizeIterator for SyntaxNodeChildren<'_, S, D> { #[inline(always)] fn len(&self) -> usize { self.inner.len() } } -impl<'n, S: Syntax, D> FusedIterator for SyntaxNodeChildren<'n, S, D> {} +impl FusedIterator for SyntaxNodeChildren<'_, S, D> {} /// An iterator over the children of a [`SyntaxNode`]. #[derive(Clone, Debug)] @@ -159,10 +159,10 @@ impl<'n, S: Syntax, D> Iterator for SyntaxElementChildren<'n, S, D> { } } -impl<'n, S: Syntax, D> ExactSizeIterator for SyntaxElementChildren<'n, S, D> { +impl ExactSizeIterator for SyntaxElementChildren<'_, S, D> { #[inline(always)] fn len(&self) -> usize { self.inner.len() } } -impl<'n, S: Syntax, D> FusedIterator for SyntaxElementChildren<'n, S, D> {} +impl FusedIterator for SyntaxElementChildren<'_, S, D> {} diff --git a/cstree/src/syntax/text.rs b/cstree/src/syntax/text.rs index 96b7bbe..b613556 100644 --- a/cstree/src/syntax/text.rs +++ b/cstree/src/syntax/text.rs @@ -258,8 +258,7 @@ impl + ?Sized, S: Syntax, D> PartialEq PartialEq> - for SyntaxText<'n1, 'i1, I1, S1, D1> +impl PartialEq> for SyntaxText<'_, '_, I1, S1, D1> where S1: Syntax, S2: Syntax,