Skip to content

Commit 3f8620e

Browse files
committed
1 parent 84d5663 commit 3f8620e

25 files changed

Lines changed: 60 additions & 61 deletions

capi/src/cerror.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct CauseIterator<'a> {
2020
current: Option<&'a dyn StdError>,
2121
}
2222

23-
impl<'a> std::iter::Iterator for CauseIterator<'a> {
23+
impl std::iter::Iterator for CauseIterator<'_> {
2424
type Item = Error;
2525

2626
fn next(&mut self) -> std::option::Option<Error> {

core/src/dfs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl<'a> CycleSafeDFS<'a> {
121121
}
122122
}
123123

124-
impl<'a> Iterator for CycleSafeDFS<'a> {
124+
impl Iterator for CycleSafeDFS<'_> {
125125
type Item = Result<DFSStep>;
126126

127127
fn next(&mut self) -> Option<Self::Item> {

core/src/graph/storage/union.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ impl<'a> UnionEdgeContainer<'a> {
1515
}
1616
}
1717

18-
impl<'a> EdgeContainer for UnionEdgeContainer<'a> {
18+
impl EdgeContainer for UnionEdgeContainer<'_> {
1919
fn get_outgoing_edges<'b>(
2020
&'b self,
2121
node: NodeID,

core/src/util/disk_collections.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ where
471471
}
472472
}
473473

474-
impl<'a, K, V> Iterator for CombinedRange<'a, K, V>
474+
impl<K, V> Iterator for CombinedRange<'_, K, V>
475475
where
476476
K: Ord,
477477
for<'de> K: 'static + Clone + KeySerializer + Send,
@@ -556,7 +556,7 @@ where
556556
}
557557
}
558558

559-
impl<'a, K, V> FusedIterator for CombinedRange<'a, K, V>
559+
impl<K, V> FusedIterator for CombinedRange<'_, K, V>
560560
where
561561
K: 'static + Ord + Clone + KeySerializer + Serialize + DeserializeOwned + Send,
562562
for<'de> V: 'static + Clone + Serialize + Deserialize<'de> + Send,

graphannis/src/annis/db/aql/operators/equal_value.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub struct EqualValue<'a> {
6565
negated: bool,
6666
}
6767

68-
impl<'a> std::fmt::Display for EqualValue<'a> {
68+
impl std::fmt::Display for EqualValue<'_> {
6969
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
7070
if self.negated {
7171
write!(f, "!=")
@@ -75,7 +75,7 @@ impl<'a> std::fmt::Display for EqualValue<'a> {
7575
}
7676
}
7777

78-
impl<'a> EqualValue<'a> {
78+
impl EqualValue<'_> {
7979
fn value_for_match(&self, m: &Match, spec: &NodeSearchSpec) -> Result<Option<Cow<str>>> {
8080
match spec {
8181
NodeSearchSpec::ExactValue { .. }
@@ -119,7 +119,7 @@ impl<'a> EqualValue<'a> {
119119
}
120120
}
121121

122-
impl<'a> BinaryOperatorBase for EqualValue<'a> {
122+
impl BinaryOperatorBase for EqualValue<'_> {
123123
fn filter_match(&self, lhs: &Match, rhs: &Match) -> Result<bool> {
124124
let lhs_val = self.value_for_match(lhs, &self.spec_left)?;
125125
let rhs_val = self.value_for_match(rhs, &self.spec_right)?;
@@ -177,7 +177,7 @@ impl<'a> BinaryOperatorBase for EqualValue<'a> {
177177
}
178178
}
179179

180-
impl<'a> BinaryOperatorIndex for EqualValue<'a> {
180+
impl BinaryOperatorIndex for EqualValue<'_> {
181181
fn retrieve_matches<'b>(&'b self, lhs: &Match) -> Box<dyn Iterator<Item = Result<Match>> + 'b> {
182182
let lhs = lhs.clone();
183183
let lhs_val = try_as_boxed_iter!(self.value_for_match(&lhs, &self.spec_left));

graphannis/src/annis/db/aql/operators/identical_cov.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ impl<'a> IdenticalCoverage<'a> {
9898
}
9999
}
100100

101-
impl<'a> std::fmt::Display for IdenticalCoverage<'a> {
101+
impl std::fmt::Display for IdenticalCoverage<'_> {
102102
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
103103
write!(f, "_=_")
104104
}
105105
}
106106

107-
impl<'a> BinaryOperatorBase for IdenticalCoverage<'a> {
107+
impl BinaryOperatorBase for IdenticalCoverage<'_> {
108108
fn filter_match(&self, lhs: &Match, rhs: &Match) -> Result<bool> {
109109
let start_lhs = self.tok_helper.left_token_for(lhs.node)?;
110110
let end_lhs = self.tok_helper.right_token_for(lhs.node)?;
@@ -155,7 +155,7 @@ impl<'a> BinaryOperatorBase for IdenticalCoverage<'a> {
155155
}
156156
}
157157

158-
impl<'a> BinaryOperatorIndex for IdenticalCoverage<'a> {
158+
impl BinaryOperatorIndex for IdenticalCoverage<'_> {
159159
fn retrieve_matches(&self, lhs: &Match) -> Box<dyn Iterator<Item = Result<Match>>> {
160160
let n_left = try_as_boxed_iter!(self.tok_helper.left_token_for(lhs.node));
161161
let n_right = try_as_boxed_iter!(self.tok_helper.right_token_for(lhs.node));

graphannis/src/annis/db/aql/operators/inclusion.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ impl<'a> Inclusion<'a> {
8686
}
8787
}
8888

89-
impl<'a> std::fmt::Display for Inclusion<'a> {
89+
impl std::fmt::Display for Inclusion<'_> {
9090
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
9191
write!(f, "_i_")
9292
}
9393
}
9494

95-
impl<'a> BinaryOperatorBase for Inclusion<'a> {
95+
impl BinaryOperatorBase for Inclusion<'_> {
9696
fn filter_match(&self, lhs: &Match, rhs: &Match) -> Result<bool> {
9797
let left_right_lhs = self.tok_helper.left_right_token_for(lhs.node)?;
9898
let left_right_rhs = self.tok_helper.left_right_token_for(rhs.node)?;
@@ -160,7 +160,7 @@ enum NodeType {
160160
Other(NodeID),
161161
}
162162

163-
impl<'a> BinaryOperatorIndex for Inclusion<'a> {
163+
impl BinaryOperatorIndex for Inclusion<'_> {
164164
fn retrieve_matches<'b>(&'b self, lhs: &Match) -> Box<dyn Iterator<Item = Result<Match>> + 'b> {
165165
let left_right_token = try_as_boxed_iter!(self.tok_helper.left_right_token_for(lhs.node));
166166
if let (Some(start_lhs), Some(end_lhs)) = left_right_token {

graphannis/src/annis/db/aql/operators/leftalignment.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ impl<'a> LeftAlignment<'a> {
5656
}
5757
}
5858

59-
impl<'a> std::fmt::Display for LeftAlignment<'a> {
59+
impl std::fmt::Display for LeftAlignment<'_> {
6060
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
6161
write!(f, "_l_")
6262
}
6363
}
6464

65-
impl<'a> BinaryOperatorBase for LeftAlignment<'a> {
65+
impl BinaryOperatorBase for LeftAlignment<'_> {
6666
fn filter_match(&self, lhs: &Match, rhs: &Match) -> Result<bool> {
6767
if let (Some(lhs_token), Some(rhs_token)) = (
6868
self.tok_helper.left_token_for(lhs.node)?,
@@ -101,7 +101,7 @@ impl<'a> BinaryOperatorBase for LeftAlignment<'a> {
101101
}
102102
}
103103

104-
impl<'a> BinaryOperatorIndex for LeftAlignment<'a> {
104+
impl BinaryOperatorIndex for LeftAlignment<'_> {
105105
fn retrieve_matches(&self, lhs: &Match) -> Box<dyn Iterator<Item = Result<Match>>> {
106106
let mut aligned = Vec::default();
107107

graphannis/src/annis/db/aql/operators/near.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ impl<'a> Near<'a> {
118118
}
119119
}
120120

121-
impl<'a> std::fmt::Display for Near<'a> {
121+
impl std::fmt::Display for Near<'_> {
122122
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
123123
write!(f, "^{}", self.spec)
124124
}
125125
}
126126

127-
impl<'a> BinaryOperatorBase for Near<'a> {
127+
impl BinaryOperatorBase for Near<'_> {
128128
fn filter_match(&self, lhs: &Match, rhs: &Match) -> Result<bool> {
129129
let start_end_forward = if self.spec.segmentation.is_some() {
130130
(lhs.node, rhs.node)
@@ -195,7 +195,7 @@ impl<'a> BinaryOperatorBase for Near<'a> {
195195
}
196196
}
197197

198-
impl<'a> BinaryOperatorIndex for Near<'a> {
198+
impl BinaryOperatorIndex for Near<'_> {
199199
fn retrieve_matches(&self, lhs: &Match) -> Box<dyn Iterator<Item = Result<Match>>> {
200200
let start_forward = if self.spec.segmentation.is_some() {
201201
Some(lhs.node)

graphannis/src/annis/db/aql/operators/negated_op.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ pub struct NegatedOp<'a> {
5454
negated_op: BinaryOperator<'a>,
5555
}
5656

57-
impl<'a> Display for NegatedOp<'a> {
57+
impl Display for NegatedOp<'_> {
5858
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
5959
write!(f, "!",)?;
6060
self.negated_op.fmt(f)?;
6161
Ok(())
6262
}
6363
}
6464

65-
impl<'a> BinaryOperatorBase for NegatedOp<'a> {
65+
impl BinaryOperatorBase for NegatedOp<'_> {
6666
fn filter_match(&self, lhs: &Match, rhs: &Match) -> Result<bool> {
6767
// Invert the filtered logic by the actual operator
6868
let orig = self.negated_op.filter_match(lhs, rhs)?;

0 commit comments

Comments
 (0)