From 185d83838cb1bc1e25497e20da9bb06e02143cf5 Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Fri, 19 Jan 2024 14:44:28 -0500 Subject: [PATCH] Linting: Impl ordering, Self refs For consistency, ordered implementation of a traits the same way as they are declared. Used `Self::` in a few last spots --- lib/oxrdf/src/dataset.rs | 8 ++++---- lib/oxrdf/src/graph.rs | 2 +- lib/oxttl/src/lexer.rs | 4 ++-- lib/oxttl/src/line_formats.rs | 14 +++++++------- lib/oxttl/src/n3.rs | 12 ++++++------ lib/oxttl/src/terse.rs | 12 ++++++------ lib/sparesults/src/solution.rs | 2 +- lib/src/sparql/eval.rs | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/oxrdf/src/dataset.rs b/lib/oxrdf/src/dataset.rs index 8412a8aa..ed6249a4 100644 --- a/lib/oxrdf/src/dataset.rs +++ b/lib/oxrdf/src/dataset.rs @@ -925,8 +925,8 @@ impl PartialEq for Dataset { impl Eq for Dataset {} impl<'a> IntoIterator for &'a Dataset { - type IntoIter = Iter<'a>; type Item = QuadRef<'a>; + type IntoIter = Iter<'a>; fn into_iter(self) -> Self::IntoIter { self.iter() @@ -1283,8 +1283,8 @@ impl<'a> GraphView<'a> { } impl<'a> IntoIterator for GraphView<'a> { - type IntoIter = GraphViewIter<'a>; type Item = TripleRef<'a>; + type IntoIter = GraphViewIter<'a>; fn into_iter(self) -> Self::IntoIter { self.iter() @@ -1292,8 +1292,8 @@ impl<'a> IntoIterator for GraphView<'a> { } impl<'a, 'b> IntoIterator for &'b GraphView<'a> { - type IntoIter = GraphViewIter<'a>; type Item = TripleRef<'a>; + type IntoIter = GraphViewIter<'a>; fn into_iter(self) -> Self::IntoIter { self.iter() @@ -1494,8 +1494,8 @@ impl<'a, 'b, T: Into>> Extend for GraphViewMut<'a> { } impl<'a> IntoIterator for &'a GraphViewMut<'a> { - type IntoIter = GraphViewIter<'a>; type Item = TripleRef<'a>; + type IntoIter = GraphViewIter<'a>; fn into_iter(self) -> Self::IntoIter { self.iter() diff --git a/lib/oxrdf/src/graph.rs b/lib/oxrdf/src/graph.rs index 33f67132..5459b65c 100644 --- a/lib/oxrdf/src/graph.rs +++ b/lib/oxrdf/src/graph.rs @@ -229,8 +229,8 @@ impl PartialEq for Graph { impl Eq for Graph {} impl<'a> IntoIterator for &'a Graph { - type IntoIter = Iter<'a>; type Item = TripleRef<'a>; + type IntoIter = Iter<'a>; fn into_iter(self) -> Self::IntoIter { self.iter() diff --git a/lib/oxttl/src/lexer.rs b/lib/oxttl/src/lexer.rs index 3fb62845..eee7cd60 100644 --- a/lib/oxttl/src/lexer.rs +++ b/lib/oxttl/src/lexer.rs @@ -49,15 +49,15 @@ pub struct N3Lexer { // TODO: simplify by not giving is_end and fail with an "unexpected eof" is none is returned when is_end=true? impl TokenRecognizer for N3Lexer { - type Options = N3LexerOptions; type Token<'a> = N3Token<'a>; + type Options = N3LexerOptions; fn recognize_next_token<'a>( &mut self, data: &'a [u8], is_ending: bool, options: &Self::Options, - ) -> Option<(usize, Result, TokenRecognizerError>)> { + ) -> Option<(usize, Result, TokenRecognizerError>)> { match *data.first()? { b'<' => match *data.get(1)? { b'<' => Some((2, Ok(N3Token::Punctuation("<<")))), diff --git a/lib/oxttl/src/line_formats.rs b/lib/oxttl/src/line_formats.rs index 5932f7a2..730da18a 100644 --- a/lib/oxttl/src/line_formats.rs +++ b/lib/oxttl/src/line_formats.rs @@ -39,9 +39,9 @@ enum NQuadsState { } impl RuleRecognizer for NQuadsRecognizer { - type Context = NQuadsRecognizerContext; - type Output = Quad; type TokenRecognizer = N3Lexer; + type Output = Quad; + type Context = NQuadsRecognizerContext; fn error_recovery_state(mut self) -> Self { self.stack.clear(); @@ -54,8 +54,8 @@ impl RuleRecognizer for NQuadsRecognizer { fn recognize_next( mut self, token: N3Token<'_>, - context: &mut NQuadsRecognizerContext, - results: &mut Vec, + context: &mut Self::Context, + results: &mut Vec, errors: &mut Vec, ) -> Self { if let Some(state) = self.stack.pop() { @@ -235,8 +235,8 @@ impl RuleRecognizer for NQuadsRecognizer { fn recognize_end( mut self, - _context: &mut NQuadsRecognizerContext, - results: &mut Vec, + _context: &mut Self::Context, + results: &mut Vec, errors: &mut Vec, ) { match &*self.stack { @@ -255,7 +255,7 @@ impl RuleRecognizer for NQuadsRecognizer { } } - fn lexer_options(context: &NQuadsRecognizerContext) -> &N3LexerOptions { + fn lexer_options(context: &Self::Context) -> &N3LexerOptions { &context.lexer_options } } diff --git a/lib/oxttl/src/n3.rs b/lib/oxttl/src/n3.rs index 263db936..516144a3 100644 --- a/lib/oxttl/src/n3.rs +++ b/lib/oxttl/src/n3.rs @@ -707,9 +707,9 @@ struct N3RecognizerContext { } impl RuleRecognizer for N3Recognizer { - type Context = N3RecognizerContext; - type Output = N3Quad; type TokenRecognizer = N3Lexer; + type Output = N3Quad; + type Context = N3RecognizerContext; fn error_recovery_state(mut self) -> Self { self.stack.clear(); @@ -722,8 +722,8 @@ impl RuleRecognizer for N3Recognizer { fn recognize_next( mut self, token: N3Token<'_>, - context: &mut N3RecognizerContext, - results: &mut Vec, + context: &mut Self::Context, + results: &mut Vec, errors: &mut Vec, ) -> Self { while let Some(rule) = self.stack.pop() { @@ -1195,7 +1195,7 @@ impl RuleRecognizer for N3Recognizer { fn recognize_end( self, - _state: &mut N3RecognizerContext, + _state: &mut Self::Context, _results: &mut Vec, errors: &mut Vec, ) { @@ -1205,7 +1205,7 @@ impl RuleRecognizer for N3Recognizer { } } - fn lexer_options(context: &N3RecognizerContext) -> &N3LexerOptions { + fn lexer_options(context: &Self::Context) -> &N3LexerOptions { &context.lexer_options } } diff --git a/lib/oxttl/src/terse.rs b/lib/oxttl/src/terse.rs index 818524f6..d94f742d 100644 --- a/lib/oxttl/src/terse.rs +++ b/lib/oxttl/src/terse.rs @@ -28,9 +28,9 @@ pub struct TriGRecognizerContext { } impl RuleRecognizer for TriGRecognizer { - type Context = TriGRecognizerContext; - type Output = Quad; type TokenRecognizer = N3Lexer; + type Output = Quad; + type Context = TriGRecognizerContext; fn error_recovery_state(mut self) -> Self { self.stack.clear(); @@ -44,8 +44,8 @@ impl RuleRecognizer for TriGRecognizer { fn recognize_next( mut self, token: N3Token<'_>, - context: &mut TriGRecognizerContext, - results: &mut Vec, + context: &mut Self::Context, + results: &mut Vec, errors: &mut Vec, ) -> Self { if let Some(rule) = self.stack.pop() { @@ -792,7 +792,7 @@ impl RuleRecognizer for TriGRecognizer { fn recognize_end( mut self, - _context: &mut TriGRecognizerContext, + _context: &mut Self::Context, results: &mut Vec, errors: &mut Vec, ) { @@ -821,7 +821,7 @@ impl RuleRecognizer for TriGRecognizer { } } - fn lexer_options(context: &TriGRecognizerContext) -> &N3LexerOptions { + fn lexer_options(context: &Self::Context) -> &N3LexerOptions { &context.lexer_options } } diff --git a/lib/sparesults/src/solution.rs b/lib/sparesults/src/solution.rs index 826a9eea..a1364861 100644 --- a/lib/sparesults/src/solution.rs +++ b/lib/sparesults/src/solution.rs @@ -171,8 +171,8 @@ impl>, S: Into>>> From<(V, S)> for Quer } impl<'a> IntoIterator for &'a QuerySolution { - type IntoIter = Iter<'a>; type Item = (&'a Variable, &'a Term); + type IntoIter = Iter<'a>; #[inline] fn into_iter(self) -> Self::IntoIter { diff --git a/lib/src/sparql/eval.rs b/lib/src/sparql/eval.rs index 19c6884d..174f41fa 100644 --- a/lib/src/sparql/eval.rs +++ b/lib/src/sparql/eval.rs @@ -111,8 +111,8 @@ impl EncodedTuple { } impl IntoIterator for EncodedTuple { - type IntoIter = std::vec::IntoIter>; type Item = Option; + type IntoIter = std::vec::IntoIter>; fn into_iter(self) -> Self::IntoIter { self.inner.into_iter()