Skip to content

Commit 36c37a7

Browse files
committed
chore: fix
1 parent bae24db commit 36c37a7

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

rust/cubesql/cubesql/src/compile/engine/df/scan.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,11 @@ pub enum FieldValue<'a> {
271271
pub trait ValueObject {
272272
fn len(&mut self) -> std::result::Result<usize, CubeError>;
273273

274-
fn get(&mut self, index: usize, field_name: &str)
275-
-> std::result::Result<FieldValue, CubeError>;
274+
fn get(
275+
&mut self,
276+
index: usize,
277+
field_name: &str,
278+
) -> std::result::Result<FieldValue<'_>, CubeError>;
276279
}
277280

278281
pub struct JsonValueObject {
@@ -294,7 +297,7 @@ impl ValueObject for JsonValueObject {
294297
&mut self,
295298
index: usize,
296299
field_name: &str,
297-
) -> std::result::Result<FieldValue, CubeError> {
300+
) -> std::result::Result<FieldValue<'_>, CubeError> {
298301
let Some(as_object) = self.rows[index].as_object() else {
299302
return Err(CubeError::user(format!(
300303
"Unexpected response from Cube, row is not an object: {:?}",

rust/cubesql/cubesql/src/compile/rewrite/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ impl Searcher<LogicalPlanLanguage, LogicalPlanAnalysis> for ListNodeSearcher {
10761076
egraph: &CubeEGraph,
10771077
eclass: Id,
10781078
limit: usize,
1079-
) -> Option<SearchMatches<LogicalPlanLanguage>> {
1079+
) -> Option<SearchMatches<'_, LogicalPlanLanguage>> {
10801080
let mut matches = SearchMatches {
10811081
substs: vec![],
10821082
eclass,
@@ -1097,7 +1097,7 @@ impl Searcher<LogicalPlanLanguage, LogicalPlanAnalysis> for ListNodeSearcher {
10971097
egraph: &CubeEGraph,
10981098
eclasses: &mut dyn Iterator<Item = Id>,
10991099
limit: usize,
1100-
) -> Vec<SearchMatches<LogicalPlanLanguage>> {
1100+
) -> Vec<SearchMatches<'_, LogicalPlanLanguage>> {
11011101
let mut result: Vec<SearchMatches<_>> = vec![];
11021102

11031103
self.list_pattern
@@ -2280,7 +2280,7 @@ impl Searcher<LogicalPlanLanguage, LogicalPlanAnalysis> for ChainSearcher {
22802280
egraph: &CubeEGraph,
22812281
eclasses: &mut dyn Iterator<Item = Id>,
22822282
limit: usize,
2283-
) -> Vec<SearchMatches<LogicalPlanLanguage>> {
2283+
) -> Vec<SearchMatches<'_, LogicalPlanLanguage>> {
22842284
let matches = self
22852285
.main
22862286
.search_eclasses_with_limit(egraph, eclasses, limit);
@@ -2298,7 +2298,7 @@ impl Searcher<LogicalPlanLanguage, LogicalPlanAnalysis> for ChainSearcher {
22982298
egraph: &CubeEGraph,
22992299
eclass: Id,
23002300
limit: usize,
2301-
) -> Option<SearchMatches<LogicalPlanLanguage>> {
2301+
) -> Option<SearchMatches<'_, LogicalPlanLanguage>> {
23022302
if let Some(m) = self.main.search_eclass_with_limit(egraph, eclass, limit) {
23032303
self.search_match_chained(egraph, m)
23042304
} else {

rust/cubesql/cubesql/src/transport/ctx.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,10 @@ impl MetaContext {
114114
}
115115
}
116116

117-
pub fn data_source_for_member_name(&self, member: &str) -> Result<DataSource, DataSourceError> {
117+
pub fn data_source_for_member_name(
118+
&self,
119+
member: &str,
120+
) -> Result<DataSource<'_>, DataSourceError> {
118121
if self.is_synthetic_field(member) {
119122
return Ok(DataSource::Unrestricted);
120123
}
@@ -128,7 +131,7 @@ impl MetaContext {
128131
pub fn data_source_for_member_names<'mem>(
129132
&self,
130133
members: impl IntoIterator<Item = &'mem str>,
131-
) -> Result<DataSource, DataSourceError> {
134+
) -> Result<DataSource<'_>, DataSourceError> {
132135
members
133136
.into_iter()
134137
.map(|member| self.data_source_for_member_name(member))

0 commit comments

Comments
 (0)