Skip to content

Commit fa984b1

Browse files
jeromegnjeromegn
committed
fix clippy
1 parent 6cd1128 commit fa984b1

File tree

11 files changed

+68
-79
lines changed

11 files changed

+68
-79
lines changed

‎crates/corro-agent/src/agent/tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@ async fn many_small_changes() -> eyre::Result<()> {
13951395

13961396
let mut start_id = 0;
13971397

1398-
FuturesUnordered::from_iter(agents.iter().map(|ta| {
1398+
let _: () = FuturesUnordered::from_iter(agents.iter().map(|ta| {
13991399
let ta = ta.clone();
14001400
start_id += 100000;
14011401
async move {
@@ -1413,7 +1413,7 @@ async fn many_small_changes() -> eyre::Result<()> {
14131413
let api_addr = ta.agent.api_addr();
14141414
let actor_id = ta.agent.actor_id();
14151415

1416-
FuturesUnordered::from_iter(durs.into_iter().map(|dur| {
1416+
let _: () = FuturesUnordered::from_iter(durs.into_iter().map(|dur| {
14171417
let client = client.clone();
14181418
start_id += 1;
14191419
async move {

‎crates/corro-agent/src/api/peer.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ async fn process_sync(
861861

862862
drop(job_tx);
863863

864-
buf.try_collect().await?;
864+
let _: () = buf.try_collect().await?;
865865

866866
debug!("done processing sync state");
867867

@@ -1228,9 +1228,8 @@ pub async fn parallel_sync(
12281228
version,
12291229
seqs: new_seqs
12301230
.into_iter()
1231-
.map(|seqs| {
1231+
.inspect(|seqs| {
12321232
range.insert(seqs.clone());
1233-
seqs
12341233
})
12351234
.collect(),
12361235
}]

‎crates/corro-pg/src/lib.rs‎

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2350,6 +2350,7 @@ impl<'a> SqliteNameRef<'a> {
23502350
}
23512351

23522352
#[derive(Clone, Debug)]
2353+
#[allow(dead_code)]
23532354
enum SqliteName {
23542355
Id(Id),
23552356
Name(Name),
@@ -3030,7 +3031,7 @@ fn field_types(
30303031
let mut field_type_overrides = HashMap::new();
30313032

30323033
match parsed_cmd {
3033-
ParsedCmd::Sqlite(Cmd::Stmt(stmt)) => match stmt {
3034+
ParsedCmd::Sqlite(Cmd::Stmt(
30343035
Stmt::Select(Select {
30353036
body:
30363037
SelectBody {
@@ -3050,51 +3051,49 @@ fn field_types(
30503051
| Stmt::Update {
30513052
returning: Some(cols),
30523053
..
3053-
} => {
3054-
for (i, col) in cols.iter().enumerate() {
3055-
if let ResultColumn::Expr(expr, _as) = col {
3056-
let type_override = match expr {
3057-
Expr::Cast { type_name, .. } => Some(name_to_type(&type_name.name)?),
3058-
Expr::FunctionCall { name, .. }
3059-
| Expr::FunctionCallStar { name, .. } => {
3060-
match name.0.as_str().to_uppercase().as_ref() {
3061-
"COUNT" => Some(Type::INT8),
3062-
_ => None,
3063-
}
3054+
},
3055+
)) => {
3056+
for (i, col) in cols.iter().enumerate() {
3057+
if let ResultColumn::Expr(expr, _as) = col {
3058+
let type_override = match expr {
3059+
Expr::Cast { type_name, .. } => Some(name_to_type(&type_name.name)?),
3060+
Expr::FunctionCall { name, .. } | Expr::FunctionCallStar { name, .. } => {
3061+
match name.0.as_str().to_uppercase().as_ref() {
3062+
"COUNT" => Some(Type::INT8),
3063+
_ => None,
30643064
}
3065-
Expr::Literal(lit) => match lit {
3066-
Literal::Numeric(s) => Some(if s.contains('.') {
3067-
Type::FLOAT8
3068-
} else {
3069-
Type::INT8
3070-
}),
3071-
Literal::String(_) => Some(Type::TEXT),
3072-
Literal::Blob(_) => Some(Type::BYTEA),
3073-
Literal::Keyword(_) => None,
3074-
Literal::Null => None,
3075-
Literal::CurrentDate => Some(Type::DATE),
3076-
Literal::CurrentTime => Some(Type::TIME),
3077-
Literal::CurrentTimestamp => Some(Type::TIMESTAMP),
3078-
},
3079-
_ => None,
3080-
};
3081-
if let Some(type_override) = type_override {
3082-
match prepped.column_name(i) {
3083-
Ok(col_name) => {
3084-
field_type_overrides.insert(col_name, type_override);
3085-
}
3086-
Err(e) => {
3087-
error!("col index didn't exist at {i}, attempted to override type as: {type_override}: {e}");
3088-
}
3065+
}
3066+
Expr::Literal(lit) => match lit {
3067+
Literal::Numeric(s) => Some(if s.contains('.') {
3068+
Type::FLOAT8
3069+
} else {
3070+
Type::INT8
3071+
}),
3072+
Literal::String(_) => Some(Type::TEXT),
3073+
Literal::Blob(_) => Some(Type::BYTEA),
3074+
Literal::Keyword(_) => None,
3075+
Literal::Null => None,
3076+
Literal::CurrentDate => Some(Type::DATE),
3077+
Literal::CurrentTime => Some(Type::TIME),
3078+
Literal::CurrentTimestamp => Some(Type::TIMESTAMP),
3079+
},
3080+
_ => None,
3081+
};
3082+
if let Some(type_override) = type_override {
3083+
match prepped.column_name(i) {
3084+
Ok(col_name) => {
3085+
field_type_overrides.insert(col_name, type_override);
3086+
}
3087+
Err(e) => {
3088+
error!("col index didn't exist at {i}, attempted to override type as: {type_override}: {e}");
30893089
}
30903090
}
3091-
} else {
3092-
break;
30933091
}
3092+
} else {
3093+
break;
30943094
}
30953095
}
3096-
_ => {}
3097-
},
3096+
}
30983097
ParsedCmd::Postgres(_stmt) => {
30993098
// TODO: handle type overrides here too
31003099
// let cols = match stmt {
@@ -3311,7 +3310,7 @@ mod tests {
33113310
println!("t2text: {:?}", row.try_get::<_, String>(2));
33123311

33133312
let now: DateTime<Utc> = Utc::now();
3314-
let now = NaiveDateTime::from_timestamp_micros(now.timestamp_micros()).unwrap();
3313+
let now = DateTime::<Utc>::from_timestamp_micros(now.timestamp_micros()).unwrap();
33153314
println!("NOW: {now:?}");
33163315

33173316
let row = client
@@ -3322,13 +3321,13 @@ mod tests {
33223321
.await?;
33233322

33243323
println!("ROW: {row:?}");
3325-
let updated_at = row.try_get::<_, NaiveDateTime>(0)?;
3324+
let updated_at = row.try_get::<_, DateTime<Utc>>(0)?;
33263325
println!("updated_at: {updated_at:?}");
33273326

33283327
assert_eq!(now, updated_at);
33293328

33303329
let future: DateTime<Utc> = Utc::now() + Duration::from_secs(1);
3331-
let future = NaiveDateTime::from_timestamp_micros(future.timestamp_micros()).unwrap();
3330+
let future = DateTime::<Utc>::from_timestamp_micros(future.timestamp_micros()).unwrap();
33323331
println!("NOW: {future:?}");
33333332

33343333
let row = client
@@ -3339,7 +3338,7 @@ mod tests {
33393338
.await?;
33403339

33413340
println!("ROW: {row:?}");
3342-
let updated_at = row.try_get::<_, NaiveDateTime>(0)?;
3341+
let updated_at = row.try_get::<_, DateTime<Utc>>(0)?;
33433342
println!("updated_at: {updated_at:?}");
33443343

33453344
assert_eq!(future, updated_at);

‎crates/corro-tpl/src/lib.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,7 @@ mod tests {
739739
let f = std::fs::OpenOptions::new()
740740
.create(true)
741741
.write(true)
742+
.truncate(false)
742743
.open(&filepath)
743744
.unwrap();
744745

@@ -788,6 +789,7 @@ mod tests {
788789
let f = std::fs::OpenOptions::new()
789790
.create(true)
790791
.write(true)
792+
.truncate(false)
791793
.open(&filepath)
792794
.unwrap();
793795

‎crates/corro-types/src/channel.rs‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -100,42 +100,36 @@ impl<T> CorroSender<T> {
100100
self.inner
101101
.send(value)
102102
.await
103-
.map(|r| {
103+
.inspect(|_r| {
104104
self.send_time.record(before.elapsed().as_secs_f64());
105105
self.send_count.increment(1);
106-
r
107106
})
108-
.map_err(|e| {
107+
.inspect_err(|_e| {
109108
self.failed_sends.increment(1);
110-
e
111109
})
112110
}
113111

114112
pub fn try_send(&self, value: T) -> Result<(), TrySendError<T>> {
115113
self.inner
116114
.try_send(value)
117-
.map(|r| {
115+
.inspect(|_r| {
118116
self.send_count.increment(1);
119-
r
120117
})
121-
.map_err(|e| {
118+
.inspect_err(|_e| {
122119
self.failed_sends.increment(1);
123-
e
124120
})
125121
}
126122

127123
pub fn blocking_send(&self, value: T) -> Result<(), SendError<T>> {
128124
let before = Instant::now();
129125
self.inner
130126
.blocking_send(value)
131-
.map(|r| {
127+
.inspect(|_r| {
132128
self.send_time.record(before.elapsed().as_secs_f64());
133129
self.send_count.increment(1);
134-
r
135130
})
136-
.map_err(|e| {
131+
.inspect_err(|_e| {
137132
self.failed_sends.increment(1);
138-
e
139133
})
140134
}
141135

@@ -148,37 +142,32 @@ impl<T> CorroSender<T> {
148142
self.inner
149143
.send_timeout(value, timeout)
150144
.await
151-
.map(|r| {
145+
.inspect(|_r| {
152146
self.send_time.record(before.elapsed().as_secs_f64());
153147
self.send_count.increment(1);
154-
r
155148
})
156-
.map_err(|e| {
149+
.inspect_err(|_e| {
157150
self.failed_sends.increment(1);
158-
e
159151
})
160152
}
161153
}
162154

163155
impl<T> CorroReceiver<T> {
164156
pub async fn recv(&mut self) -> Option<T> {
165-
self.inner.recv().await.map(|r| {
157+
self.inner.recv().await.inspect(|_r| {
166158
self.recv_count.increment(1);
167-
r
168159
})
169160
}
170161

171162
pub fn try_recv(&mut self) -> Result<T, TryRecvError> {
172-
self.inner.try_recv().map(|r| {
163+
self.inner.try_recv().inspect(|_r| {
173164
self.recv_count.increment(1);
174-
r
175165
})
176166
}
177167

178168
pub fn blocking_recv(&mut self) -> Option<T> {
179-
self.inner.blocking_recv().map(|r| {
169+
self.inner.blocking_recv().inspect(|_r| {
180170
self.recv_count.increment(1);
181-
r
182171
})
183172
}
184173
}

‎crates/corro-types/src/sqlite.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ mod tests {
227227
let pool = pool.clone();
228228
async move {
229229
tokio::spawn(async move {
230-
FuturesUnordered::from_iter((0..per_worker).map(|_| {
230+
let _: () = FuturesUnordered::from_iter((0..per_worker).map(|_| {
231231
let pool = pool.clone();
232232
async move {
233233
let conn = pool.get().await?;
@@ -250,7 +250,7 @@ mod tests {
250250
}
251251
}));
252252

253-
futs.try_collect().await?;
253+
let _: () = futs.try_collect().await?;
254254

255255
let conn = pool.get().await?;
256256

‎crates/corro-types/src/sync.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ pub async fn generate_sync(bookie: &Bookie, self_actor_id: ActorId) -> SyncState
300300
for (actor_id, booked) in actors {
301301
let bookedr = booked.read("generate_sync", actor_id.as_simple()).await;
302302

303-
let last_version = match { bookedr.last() } {
303+
let last_version = match bookedr.last() {
304304
None => continue,
305305
Some(v) => v,
306306
};

‎crates/corrosion/src/command/consul/sync.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@ enum ConsulCheckOp {
480480
Delete { id: String },
481481
}
482482

483-
///
484483
fn update_services(
485484
mut services: HashMap<String, AgentService>,
486485
hashes: &HashMap<String, u64>,

‎crates/corrosion/src/main.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,7 @@ async fn process_cli(cli: Cli) -> eyre::Result<()> {
505505
.read(true)
506506
.write(true)
507507
.create(true)
508+
.truncate(false)
508509
.open(db_path)?;
509510

510511
info!("Acquiring lock...");

‎crates/sqlite-pool/src/config.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ use crate::{
1010

1111
/// Configuration object.
1212
#[derive(Clone, Debug, Default)]
13-
#[cfg_attr(feature = "serde", derive(serde_1::Deserialize, serde_1::Serialize))]
14-
#[cfg_attr(feature = "serde", serde(crate = "serde_1"))]
1513
pub struct Config {
1614
/// Path to SQLite database file.
1715
pub path: PathBuf,

0 commit comments

Comments
 (0)