Skip to content

Commit f94aef1

Browse files
chore: clippy fixes
Signed-off-by: Henry Gressmann <[email protected]>
1 parent 90491a3 commit f94aef1

File tree

6 files changed

+22
-48
lines changed

6 files changed

+22
-48
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ rust-version="1.80"
66
repository="https://github.com/explodingcamera/liwan"
77

88
[dependencies]
9+
tokio={version="1.38", default-features=false, features=["rt-multi-thread"]}
10+
tokio-util={version="0.7", features=["io"]}
11+
futures-util="0.3"
12+
913
# encoding
1014
hex={version="0.4"}
1115
bs58="0.5.1"
@@ -28,19 +32,17 @@ crossbeam="0.8"
2832
cached="0.53"
2933
tracing="0.1"
3034
tracing-subscriber={version="0.3", features=["env-filter"]}
35+
async-compression="0.4.12"
36+
tokio-tar={package="krata-tokio-tar", version="0.4.0"}
3137

3238
# web
33-
tokio={version="1.38", default-features=false, features=["rt-multi-thread"]}
34-
tokio-util={version="0.7", features=["io"]}
3539
poem={version="3.0", features=["embed", "session", "cookie", "compression", "tower-compat"]}
3640
poem-openapi={version="5.0", features=["chrono"]}
3741
tower={version="0.4.8", default-features=false, features=["limit"]}
3842
uaparser="0.6"
3943
mime_guess={version="2.0"}
4044
rust-embed="8.4"
4145
reqwest={version="0.12", features=["json", "stream"]}
42-
tokio-tar={package="krata-tokio-tar", version="0.4.0"}
43-
async-compression="0.4.12"
4446

4547
# database
4648
duckdb={version="1.0", features=["bundled", "chrono", "r2d2"]}
@@ -50,7 +52,6 @@ r2d2_sqlite="0.25.0"
5052
refinery={version="0.8"}
5153
refinery-core="0.8"
5254
maxminddb={version="0.24", optional=true}
53-
futures="0.3.30"
5455

5556
[features]
5657
default=["geoip"]

src/app/core/geoip.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(dead_code)]
2+
13
use std::{
24
collections::HashMap,
35
path::{Path, PathBuf},
@@ -10,7 +12,7 @@ use std::{
1012
use crate::app::SqlitePool;
1113
use crossbeam::sync::ShardedLock;
1214
use eyre::{OptionExt, Result};
13-
use futures::{StreamExt, TryStreamExt};
15+
use futures_util::{StreamExt, TryStreamExt};
1416
use md5::{Digest, Md5};
1517
use tokio_tar::Archive;
1618
use tokio_util::io::StreamReader;
@@ -134,7 +136,7 @@ async fn get_latest_md5(edition: &str, account_id: &str, license_key: &str) -> R
134136
Ok(response
135137
.get("databases")
136138
.ok_or_eyre("No databases found")?
137-
.get(0)
139+
.first()
138140
.ok_or_eyre("MD5 hash not found")?
139141
.get("md5")
140142
.ok_or_eyre("MD5 hash not found")?
@@ -161,8 +163,8 @@ async fn download_maxmind_db(edition: &str, account_id: &str, license_key: &str)
161163
let mut archive = Archive::new(stream);
162164
let mut entries = archive.entries()?;
163165

164-
let folder = PathBuf::from(std::env::temp_dir()).join("liwan-geoip");
165-
let mut file = PathBuf::new();
166+
let folder = std::env::temp_dir().join("liwan-geoip");
167+
let file;
166168
loop {
167169
let mut entry = entries
168170
.next()
@@ -171,7 +173,6 @@ async fn download_maxmind_db(edition: &str, account_id: &str, license_key: &str)
171173
.map_err(|e| eyre::eyre!("Failed to read entry: {}", e))?;
172174

173175
let entry_path = entry.path()?;
174-
175176
if entry_path.extension().map_or(false, |ext| ext == "mmdb") {
176177
file = entry
177178
.unpack_in(folder)

src/app/db.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ pub(super) fn init_sqlite(
3838

3939
{
4040
let conn = pool.get()?;
41-
conn.pragma_update(None, "foreign_keys", &"ON")?;
42-
conn.pragma_update(None, "journal_mode", &"WAL")?;
43-
conn.pragma_update(None, "synchronous", &"NORMAL")?;
44-
conn.pragma_update(None, "mmap_size", &"268435456")?;
45-
conn.pragma_update(None, "journal_size_limit", &"268435456")?;
46-
conn.pragma_update(None, "cache_size", &"2000")?;
41+
conn.pragma_update(None, "foreign_keys", "ON")?;
42+
conn.pragma_update(None, "journal_mode", "WAL")?;
43+
conn.pragma_update(None, "synchronous", "NORMAL")?;
44+
conn.pragma_update(None, "mmap_size", "268435456")?;
45+
conn.pragma_update(None, "journal_size_limit", "268435456")?;
46+
conn.pragma_update(None, "cache_size", "2000")?;
4747
}
4848

4949
Ok(pool)

src/app/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ impl Liwan {
8484
("entity-2", "Entity 2", "test.example.com", vec!["private-project".to_string()]),
8585
("entity-3", "Entity 3", "example.org", vec!["public-project".to_string()]),
8686
];
87-
let projects = vec![("public-project", "Public Project", true), ("private-project", "Private Project", false)];
88-
let users = vec![("admin", "admin", UserRole::Admin), ("user", "user", UserRole::User)];
87+
let projects = [("public-project", "Public Project", true), ("private-project", "Private Project", false)];
88+
let users = [("admin", "admin", UserRole::Admin), ("user", "user", UserRole::User)];
8989

9090
for (username, password, role) in users.iter() {
9191
self.users.create(username, password, *role, &[])?;

src/utils/seed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ fn random_date(min: DateTime<Utc>, max: DateTime<Utc>, scale: f64) -> DateTime<U
7474
min + weighted_duration
7575
}
7676

77-
fn random_el<'a, T>(slice: &'a [T], scale: f64) -> &'a T {
77+
fn random_el<T>(slice: &[T], scale: f64) -> &T {
7878
let mut rng = rand::thread_rng();
7979
let len = slice.len();
8080

0 commit comments

Comments
 (0)