diff --git a/query-projector/src/lib.rs b/query-projector/src/lib.rs index c4625eb1..1cf08f08 100644 --- a/query-projector/src/lib.rs +++ b/query-projector/src/lib.rs @@ -364,7 +364,7 @@ impl TypedIndex { /// /// This function will return a runtime error if the type tag is unknown, or the value is /// otherwise not convertible by the DB layer. - fn lookup<'a, 'stmt>(&self, row: &Row<'a, 'stmt>) -> Result { + fn lookup<'a>(&self, row: &Row<'a>) -> Result { use TypedIndex::*; match self { diff --git a/query-projector/src/projectors/pull_two_stage.rs b/query-projector/src/projectors/pull_two_stage.rs index 01a639b7..ca8f5bdf 100644 --- a/query-projector/src/projectors/pull_two_stage.rs +++ b/query-projector/src/projectors/pull_two_stage.rs @@ -120,7 +120,7 @@ impl TupleTwoStagePullProjector { } // This is exactly the same as for rel. - fn collect_bindings<'a, 'stmt>(&self, row: Row<'a, 'stmt>) -> Result> { + fn collect_bindings<'a>(&self, row: Row<'a>) -> Result> { // There will be at least as many SQL columns as Datalog columns. // gte 'cos we might be querying extra columns for ordering. // The templates will take care of ignoring columns. @@ -204,7 +204,7 @@ impl RelTwoStagePullProjector { } } - fn collect_bindings_into<'a, 'stmt, 'out>(&self, row: Row<'a, 'stmt>, out: &mut Vec) -> Result<()> { + fn collect_bindings_into<'a>(&self, row: Row<'a>, out: &mut Vec) -> Result<()> { // There will be at least as many SQL columns as Datalog columns. // gte 'cos we might be querying extra columns for ordering. // The templates will take care of ignoring columns. diff --git a/query-projector/src/projectors/simple.rs b/query-projector/src/projectors/simple.rs index b6b61b7d..d14f73b9 100644 --- a/query-projector/src/projectors/simple.rs +++ b/query-projector/src/projectors/simple.rs @@ -93,7 +93,7 @@ impl TupleProjector { } // This is just like we do for `rel`, but into a vec of its own. - fn collect_bindings<'a, 'stmt>(&self, row: Row<'a, 'stmt>) -> Result> { + fn collect_bindings<'a>(&self, row: Row<'a>) -> Result> { // There will be at least as many SQL columns as Datalog columns. // gte 'cos we might be querying extra columns for ordering. // The templates will take care of ignoring columns. @@ -151,7 +151,7 @@ impl RelProjector { } } - fn collect_bindings_into<'a, 'stmt, 'out>(&self, row: Row<'a, 'stmt>, out: &mut Vec) -> Result<()> { + fn collect_bindings_into<'a>(&self, row: Row<'a>, out: &mut Vec) -> Result<()> { // There will be at least as many SQL columns as Datalog columns. // gte 'cos we might be querying extra columns for ordering. // The templates will take care of ignoring columns. diff --git a/query-projector/src/pull.rs b/query-projector/src/pull.rs index 33cf0b81..21a47751 100644 --- a/query-projector/src/pull.rs +++ b/query-projector/src/pull.rs @@ -93,7 +93,7 @@ impl<'schema> PullConsumer<'schema> { Ok(PullConsumer::for_puller(puller, schema, PullIndices::zero())) } - pub(crate) fn collect_entity<'a, 'stmt>(&mut self, row: &rusqlite::Row<'a, 'stmt>) -> Entid { + pub(crate) fn collect_entity<'a>(&mut self, row: &rusqlite::Row<'a>) -> Entid { let entity = row.get(self.indices.sql_index); self.entities.insert(entity); entity