Skip to content

Commit a16309a

Browse files
parmesantnikhilsinhaparseable
authored andcommitted
fix clippy warnings
1 parent 35674fc commit a16309a

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ mime = "0.3.17"
3434
### other dependencies
3535
anyhow = { version = "1.0", features = ["backtrace"] }
3636
argon2 = "0.5.0"
37-
async-trait = "0.1"
37+
async-trait = "0.1.82"
3838
base64 = "0.22.0"
3939
lazy_static = "1.4"
4040
bytes = "1.4"
@@ -71,7 +71,7 @@ prometheus = { version = "0.13", features = ["process"] }
7171
rand = "0.8"
7272
regex = "1.7.3"
7373
relative-path = { version = "1.7", features = ["serde"] }
74-
reqwest = { version = "0.11.27", default_features = false, features = [
74+
reqwest = { version = "0.11.27", default-features = false, features = [
7575
"rustls-tls",
7676
"json",
7777
] } # cannot update cause rustls is not latest `see rustls`
@@ -113,7 +113,7 @@ sha1_smol = { version = "1.0", features = ["std"] }
113113
static-files = "0.2"
114114
ureq = "2.6"
115115
vergen = { version = "8.1", features = ["build", "git", "cargo", "gitcl"] }
116-
zip = { version = "1.1.1", default_features = false, features = ["deflate"] }
116+
zip = { version = "1.1.1", default-features = false, features = ["deflate"] }
117117
url = "2.4.0"
118118
prost-build = "0.12.3"
119119

server/src/storage/s3.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ impl S3 {
322322
stream_json_check.push(task);
323323
}
324324

325-
stream_json_check.try_collect().await?;
325+
stream_json_check.try_collect::<()>().await?;
326326

327327
Ok(dirs.into_iter().map(|name| LogStream { name }).collect())
328328
}
@@ -633,7 +633,7 @@ impl ObjectStorage for S3 {
633633
stream_json_check.push(task);
634634
}
635635

636-
stream_json_check.try_collect().await?;
636+
stream_json_check.try_collect::<()>().await?;
637637

638638
Ok(dirs.into_iter().map(|name| LogStream { name }).collect())
639639
}

server/src/utils/arrow.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,8 @@ pub fn record_batches_to_json(records: &[&RecordBatch]) -> Result<Vec<Map<String
9898

9999
let buf = writer.into_inner();
100100

101-
let json_rows: Vec<Map<String, Value>> = match serde_json::from_reader(buf.as_slice()) {
102-
Ok(json) => json,
103-
Err(_) => vec![],
104-
};
101+
let json_rows: Vec<Map<String, Value>> =
102+
serde_json::from_reader(buf.as_slice()).unwrap_or_default();
105103

106104
Ok(json_rows)
107105
}

0 commit comments

Comments
 (0)