Skip to content

Commit 816f19f

Browse files
committed
refactor: fix cargo lint checks for collapsible ifs and mismatched_lifetime_syntaxes
1 parent 17ef955 commit 816f19f

File tree

9 files changed

+46
-49
lines changed

9 files changed

+46
-49
lines changed

src/about.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ pub fn print_about(
112112
current_version,
113113
); // " " " "
114114

115-
if let Some(latest_release) = latest_release {
116-
if latest_release.version > current_version {
117-
print_latest_release(latest_release);
118-
}
115+
if let Some(latest_release) = latest_release
116+
&& latest_release.version > current_version
117+
{
118+
print_latest_release(latest_release);
119119
}
120120

121121
eprintln!(

src/catalog/manifest.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,12 @@ pub fn create_from_parquet_file(
112112
let columns = column_statistics(row_groups);
113113
manifest_file.columns = columns.into_values().collect();
114114
let mut sort_orders = sort_order(row_groups);
115-
if let Some(last_sort_order) = sort_orders.pop() {
116-
if sort_orders
115+
if let Some(last_sort_order) = sort_orders.pop()
116+
&& sort_orders
117117
.into_iter()
118118
.all(|sort_order| sort_order == last_sort_order)
119-
{
120-
manifest_file.sort_order_id = last_sort_order;
121-
}
119+
{
120+
manifest_file.sort_order_id = last_sort_order;
122121
}
123122

124123
Ok(manifest_file)

src/catalog/mod.rs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -268,27 +268,27 @@ async fn create_manifest(
268268
..Manifest::default()
269269
};
270270
let mut first_event_at = PARSEABLE.get_stream(stream_name)?.get_first_event();
271-
if first_event_at.is_none() {
272-
if let Some(first_event) = manifest.files.first() {
273-
let time_partition = &meta.time_partition;
274-
let lower_bound = match time_partition {
275-
Some(time_partition) => {
276-
let (lower_bound, _) = get_file_bounds(first_event, time_partition.to_string());
277-
lower_bound
278-
}
279-
None => {
280-
let (lower_bound, _) =
281-
get_file_bounds(first_event, DEFAULT_TIMESTAMP_KEY.to_string());
282-
lower_bound
283-
}
284-
};
285-
first_event_at = Some(lower_bound.with_timezone(&Local).to_rfc3339());
286-
match PARSEABLE.get_stream(stream_name) {
287-
Ok(stream) => stream.set_first_event_at(first_event_at.as_ref().unwrap()),
288-
Err(err) => error!(
289-
"Failed to update first_event_at in streaminfo for stream {stream_name:?}, error = {err:?}"
290-
),
271+
if first_event_at.is_none()
272+
&& let Some(first_event) = manifest.files.first()
273+
{
274+
let time_partition = &meta.time_partition;
275+
let lower_bound = match time_partition {
276+
Some(time_partition) => {
277+
let (lower_bound, _) = get_file_bounds(first_event, time_partition.to_string());
278+
lower_bound
291279
}
280+
None => {
281+
let (lower_bound, _) =
282+
get_file_bounds(first_event, DEFAULT_TIMESTAMP_KEY.to_string());
283+
lower_bound
284+
}
285+
};
286+
first_event_at = Some(lower_bound.with_timezone(&Local).to_rfc3339());
287+
match PARSEABLE.get_stream(stream_name) {
288+
Ok(stream) => stream.set_first_event_at(first_event_at.as_ref().unwrap()),
289+
Err(err) => error!(
290+
"Failed to update first_event_at in streaminfo for stream {stream_name:?}, error = {err:?}"
291+
),
292292
}
293293
}
294294

@@ -366,8 +366,8 @@ pub async fn get_first_event(
366366
Mode::All | Mode::Ingest => {
367367
// get current snapshot
368368
let stream_first_event = PARSEABLE.get_stream(stream_name)?.get_first_event();
369-
if stream_first_event.is_some() {
370-
first_event_at = stream_first_event.unwrap();
369+
if let Some(first_event) = stream_first_event {
370+
first_event_at = first_event;
371371
} else {
372372
let mut meta = storage.get_object_store_format(stream_name).await?;
373373
let meta_clone = meta.clone();

src/event/format/json.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,8 @@ fn valid_type(
315315

316316
fn validate_int(value: &Value, static_schema_flag: bool) -> bool {
317317
// allow casting string to int for static schema
318-
if static_schema_flag {
319-
if let Value::String(s) = value {
320-
return s.trim().parse::<i64>().is_ok();
321-
}
318+
if static_schema_flag && let Value::String(s) = value {
319+
return s.trim().parse::<i64>().is_ok();
322320
}
323321
value.is_i64()
324322
}

src/handlers/http/audit.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ pub async fn audit_log_middleware(
5151
log_builder = log_builder.with_stream(message.common_attributes.x_p_stream);
5252
} else if let Some(stream) = req.match_info().get("logstream") {
5353
log_builder = log_builder.with_stream(stream);
54-
} else if let Some(value) = req.headers().get(STREAM_NAME_HEADER_KEY) {
55-
if let Ok(stream) = value.to_str() {
56-
log_builder = log_builder.with_stream(stream);
57-
}
54+
} else if let Some(value) = req.headers().get(STREAM_NAME_HEADER_KEY)
55+
&& let Ok(stream) = value.to_str()
56+
{
57+
log_builder = log_builder.with_stream(stream);
5858
}
5959

6060
// Get username and authorization method

src/handlers/http/logstream.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ pub async fn delete(stream_name: Path<String>) -> Result<impl Responder, StreamE
6868
)
6969
}
7070

71-
if let Some(hot_tier_manager) = HotTierManager::global() {
72-
if hot_tier_manager.check_stream_hot_tier_exists(&stream_name) {
73-
hot_tier_manager.delete_hot_tier(&stream_name).await?;
74-
}
71+
if let Some(hot_tier_manager) = HotTierManager::global()
72+
&& hot_tier_manager.check_stream_hot_tier_exists(&stream_name)
73+
{
74+
hot_tier_manager.delete_hot_tier(&stream_name).await?;
7575
}
7676

7777
// Delete from memory

src/handlers/http/query.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ pub async fn get_counts(
346346
let body = counts_request.into_inner();
347347

348348
// does user have access to table?
349-
user_auth_for_datasets(&permissions, &[body.stream.clone()]).await?;
349+
user_auth_for_datasets(&permissions, std::slice::from_ref(&body.stream)).await?;
350350

351351
// if the user has given a sql query (counts call with filters applied), then use this flow
352352
// this could include filters or group by

src/handlers/livetail.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ fn extract_basic_auth(header: &MetadataMap) -> Option<Credentials> {
273273
.and_then(|value| Credentials::from_header(value.to_string()).ok())
274274
}
275275

276-
fn extract_cookie(header: &MetadataMap) -> Option<Cookie> {
276+
fn extract_cookie(header: &MetadataMap) -> Option<Cookie<'_>> {
277277
// extract the cookie from the request
278278
let cookies = header.get_all("cookie");
279279
let cookies: Vec<_> = cookies

src/livetail.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ impl Stream for ReceiverPipe {
160160
// drop sender on map when going out of scope
161161
impl Drop for ReceiverPipe {
162162
fn drop(&mut self) {
163-
if let Some(map) = self._ref.upgrade() {
164-
if let Some(pipes) = map.write().unwrap().get_mut(&self.stream) {
165-
pipes.retain(|x| x.id != self.id)
166-
}
163+
if let Some(map) = self._ref.upgrade()
164+
&& let Some(pipes) = map.write().unwrap().get_mut(&self.stream)
165+
{
166+
pipes.retain(|x| x.id != self.id)
167167
}
168168
}
169169
}

0 commit comments

Comments
 (0)