cleanup: lifetime elision warnings

Author: proycon

src/annotation.rs

@@ -572,7 +572,7 @@ impl Annotation {
 
     /// Iterate over the annotation data, returns tuples of internal IDs for (annotationset,annotationdata)
     /// For a higher-level method, use [`ResultItem<Annotation>::data()`] instead.
-    pub fn data(&self) -> Iter<(AnnotationDataSetHandle, AnnotationDataHandle)> {
+    pub fn data<'a>(&'a self) -> Iter<'a, (AnnotationDataSetHandle, AnnotationDataHandle)> {
         self.data.iter()
     }
 

src/annotationdata.rs

@@ -289,7 +289,7 @@ impl<'a> AnnotationDataBuilder<'a> {
         self
     }
 
-    pub fn id(&self) -> &BuildItem<AnnotationData> {
+    pub fn id(&self) -> &BuildItem<'_, AnnotationData> {
         &self.id
     }
 
@@ -298,7 +298,7 @@ impl<'a> AnnotationDataBuilder<'a> {
         self
     }
 
-    pub fn dataset(&self) -> &BuildItem<AnnotationDataSet> {
+    pub fn dataset(&self) -> &BuildItem<'_, AnnotationDataSet> {
         &self.dataset
     }
 
@@ -307,7 +307,7 @@ impl<'a> AnnotationDataBuilder<'a> {
         self
     }
 
-    pub fn key(&self) -> &BuildItem<DataKey> {
+    pub fn key(&self) -> &BuildItem<'_, DataKey> {
         &self.key
     }
 

src/annotationdataset.rs

@@ -652,12 +652,12 @@ impl AnnotationDataSet {
     }
 
     ///Returns an iterator over all the data ([`AnnotationData`]) in this set, the iterator returns references to [`AnnotationData`].
-    pub fn data(&self) -> StoreIter<AnnotationData> {
+    pub fn data<'a>(&'a self) -> StoreIter<'a, AnnotationData> {
         <Self as StoreFor<AnnotationData>>::iter(self)
     }
 
     /// Returns an iterator over all the keys ([`DataKey`]) in this set, the iterator in returns references to [`DataKey`]
-    pub fn keys(&self) -> StoreIter<DataKey> {
+    pub fn keys<'a>(&'a self) -> StoreIter<'a, DataKey> {
         <Self as StoreFor<DataKey>>::iter(self)
     }
 

src/api/annotationstore.rs

@@ -31,28 +31,28 @@ impl AnnotationStore {
     ///
     /// The item is returned as a fat pointer [`ResultItem<TextResource>`]) in an Option.
     /// Returns `None` if it does not exist.
-    pub fn resource(
-        &self,
+    pub fn resource<'a>(
+        &'a self,
         request: impl Request<TextResource>,
-    ) -> Option<ResultItem<TextResource>> {
+    ) -> Option<ResultItem<'a, TextResource>> {
         self.get(request).map(|x| x.as_resultitem(self, self)).ok()
     }
 
     /// Requests a specific [`AnnotationDataSet`] from the store to be returned by reference.
     /// The `request` parameter encapsulates some kind of identifier, it can be a `&str`, [`String`] or [`AnnotationDataSetHandle`].
-    pub fn dataset(
-        &self,
+    pub fn dataset<'a>(
+        &'a self,
         request: impl Request<AnnotationDataSet>,
-    ) -> Option<ResultItem<AnnotationDataSet>> {
+    ) -> Option<ResultItem<'a, AnnotationDataSet>> {
         self.get(request).map(|x| x.as_resultitem(self, self)).ok()
     }
 
     /// Requests a specific [`DataKey`] (pertaining to an [`AnnotationDataSet`]) to be returned by reference.
-    pub fn key(
-        &self,
+    pub fn key<'a>(
+        &'a self,
         set: impl Request<AnnotationDataSet>,
         key: impl Request<DataKey>,
-    ) -> Option<ResultItem<DataKey>> {
+    ) -> Option<ResultItem<'a, DataKey>> {
         if let Some(dataset) = self.dataset(set) {
             dataset.key(key)
         } else {
@@ -61,11 +61,11 @@ impl AnnotationStore {
     }
 
     /// Requests a specific [`AnnotationData`] (pertaining to an [`AnnotationDataSet`]) to be returned by reference.
-    pub fn annotationdata(
-        &self,
+    pub fn annotationdata<'a>(
+        &'a self,
         set: impl Request<AnnotationDataSet>,
         data: impl Request<AnnotationData>,
-    ) -> Option<ResultItem<AnnotationData>> {
+    ) -> Option<ResultItem<'a, AnnotationData>> {
         if let Some(dataset) = self.dataset(set) {
             dataset.annotationdata(data)
         } else {
@@ -74,11 +74,11 @@ impl AnnotationStore {
     }
 
     /// Requests a specific [`TextSelection`] by handle (pertaining to an [`AnnotationDataSet`]) to be returned by reference.
-    pub fn textselection(
-        &self,
+    pub fn textselection<'a>(
+        &'a self,
         resource: impl Request<TextResource>,
         handle: TextSelectionHandle,
-    ) -> Option<ResultTextSelection> {
+    ) -> Option<ResultTextSelection<'a>> {
         if let Some(resource) = self.resource(resource) {
             resource.textselection_by_handle(handle).ok()
         } else {
@@ -92,16 +92,19 @@ impl AnnotationStore {
     /// The item is returned as a fat pointer [`ResultItem<Annotation>`]),
     /// which exposes the high-level API, in an Option.
     /// Returns `None` if it does not exist.
-    pub fn annotation(&self, request: impl Request<Annotation>) -> Option<ResultItem<Annotation>> {
+    pub fn annotation<'a>(
+        &'a self,
+        request: impl Request<Annotation>,
+    ) -> Option<ResultItem<'a, Annotation>> {
         self.get(request).map(|x| x.as_resultitem(self, self)).ok()
     }
 
     /// Requests a specific [`AnnotationSubStore`] from the store to be returned by reference.
     /// The `request` parameter encapsulates some kind of identifier, it can be a `&str`, [`String`] or [`AnnotationSubStoreHandle`].
-    pub fn substore(
-        &self,
+    pub fn substore<'a>(
+        &'a self,
         request: impl Request<AnnotationSubStore>,
-    ) -> Option<ResultItem<AnnotationSubStore>> {
+    ) -> Option<ResultItem<'a, AnnotationSubStore>> {
         self.get(request).map(|x| x.as_resultitem(self, self)).ok()
     }
 

src/api/query.rs

@@ -1115,12 +1115,12 @@ impl<'a> Query<'a> {
     }
 
     /// Iterates over all constraints in the Query
-    pub fn constraints(&self) -> std::slice::Iter<Constraint<'a>> {
+    pub fn constraints(&'a self) -> std::slice::Iter<'a, Constraint<'a>> {
         self.constraints.iter()
     }
 
     /// Returns all attributes for this query
-    pub fn attributes(&self) -> std::slice::Iter<&'a str> {
+    pub fn attributes(&'a self) -> std::slice::Iter<'a, &'a str> {
         self.attributes.iter()
     }
 
@@ -1135,12 +1135,12 @@ impl<'a> Query<'a> {
 
     /// Iterates over all constraints in the Query
     /// Alias for `constraints()`,
-    pub fn iter(&self) -> std::slice::Iter<Constraint<'a>> {
+    pub fn iter(&'a self) -> std::slice::Iter<'a, Constraint<'a>> {
         self.constraints.iter()
     }
 
     /// Iterates over all assignments in the Query
-    pub fn assignments(&self) -> std::slice::Iter<Assignment<'a>> {
+    pub fn assignments(&'a self) -> std::slice::Iter<'a, Assignment<'a>> {
         self.assignments.iter()
     }
 

src/api/textselection.rs

@@ -310,7 +310,7 @@ impl<'store> ResultTextSelection<'store> {
     }
 
     /// Iterator covering the full text of text selection as a sequence of minimum-length non-overlapping TextSelections, in textual order
-    pub fn segmentation(&self) -> SegmentationIter {
+    pub fn segmentation<'a>(&'a self) -> SegmentationIter<'a> {
         self.resource()
             .segmentation_in_range(self.begin(), self.end())
     }

src/api/translate.rs

@@ -1,8 +1,7 @@
-use std::collections::VecDeque;
 
-use crate::{api::*, Cursor, ResultTextSelection};
+use crate::{api::*, ResultTextSelection};
 use crate::datavalue::DataValue;
-use crate::selector::{Offset, OffsetMode, SelectorBuilder};
+use crate::selector::{Offset, SelectorBuilder};
 use crate::text::Text;
 use crate::textselection::{ResultTextSelectionSet, TestTextSelection};
 use crate::AnnotationBuilder;

src/resources.rs

@@ -730,7 +730,7 @@ impl TextResource {
     }
 
     /// Returns a low-level iterator over the position index
-    pub fn positionindex_iter(&self) -> btree_map::Iter<usize, PositionIndexItem> {
+    pub fn positionindex_iter<'a>(&'a self) -> btree_map::Iter<'a, usize, PositionIndexItem> {
         self.positionindex.0.iter()
     }
 

src/store.rs

@@ -905,7 +905,7 @@ pub trait StoreFor<T: Storable>: Configurable + private::StoreCallbacks<T> {
     /// Iterate over all items in the store
     /// This is a low-level API method, use dedicated high-level iterators like `annotations()`, `resources()` instead.  
     #[inline]
-    fn iter(&self) -> StoreIter<T>
+    fn iter<'a>(&'a self) -> StoreIter<'a, T>
     where
         T: Storable<StoreType = Self>,
     {
@@ -918,7 +918,7 @@ pub trait StoreFor<T: Storable>: Configurable + private::StoreCallbacks<T> {
 
     /// Iterate over the store, mutably
     /// This is a low-level API method.
-    fn iter_mut(&mut self) -> StoreIterMut<T> {
+    fn iter_mut<'a>(&'a mut self) -> StoreIterMut<'a, T> {
         let len = self.store().len();
         StoreIterMut {
             iter: self.store_mut().iter_mut(),
@@ -981,7 +981,10 @@ pub(crate) mod private {
 pub(crate) trait WrappableStore<T: Storable>: StoreFor<T> {
     /// Wraps the entire store along with a reference to self
     /// Low-level method that you won't need
-    fn wrap_store(&self, substore: Option<AnnotationSubStoreHandle>) -> WrappedStore<T, Self>
+    fn wrap_store<'a>(
+        &'a self,
+        substore: Option<AnnotationSubStoreHandle>,
+    ) -> WrappedStore<'a, T, Self>
     where
         Self: Sized,
     {

src/textselection.rs

@@ -506,10 +506,10 @@ impl Default for PositionIndex {
 
 impl PositionIndex {
     //Returns an iterator over all positions in in index, in sorted order
-    pub fn keys(&self) -> btree_map::Keys<usize, PositionIndexItem> {
+    pub fn keys<'a>(&'a self) -> btree_map::Keys<'a, usize, PositionIndexItem> {
         self.0.keys()
     }
-    pub fn iter(&self) -> btree_map::Iter<usize, PositionIndexItem> {
+    pub fn iter<'a>(&'a self) -> btree_map::Iter<'a, usize, PositionIndexItem> {
         self.0.iter()
     }
 }
@@ -1220,7 +1220,7 @@ impl TextSelectionSet {
         }
     }
 
-    pub fn as_resultset(self, store: &AnnotationStore) -> ResultTextSelectionSet {
+    pub fn as_resultset<'a>(self, store: &'a AnnotationStore) -> ResultTextSelectionSet<'a> {
         ResultTextSelectionSet {
             tset: self,
             rootstore: store,