Skip to content

Commit d248d79

Browse files
committed
Fixed: resolve clippy lints in serdesai tests
- Merge split doc comment on OverridingRunHook (empty line after doc) - Block-scope captured-settings MutexGuards so no guard lexically spans an await (clippy::await_holding_lock) - Pass predicate directly to Iterator::position (redundant closure) - Use next_back instead of last on a DoubleEndedIterator - Use an array for the fixed expected-transcript fixture (useless vec)
1 parent 224880a commit d248d79

2 files changed

Lines changed: 28 additions & 25 deletions

File tree

‎src/reloaded-code-serdesai/src/agent_runtime/stream_events.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ mod tests {
653653

654654
let messages = distill_messages(vec![request, follow_up]);
655655

656-
let expected = vec![
656+
let expected = [
657657
RunMessage {
658658
role: RunMessageRole::System,
659659
text: Some("sys".into()),
@@ -1007,7 +1007,7 @@ mod tests {
10071007

10081008
/// Index of the first event matching `predicate`.
10091009
fn position(events: &[RunEvent], predicate: &dyn Fn(&RunEvent) -> bool) -> Option<usize> {
1010-
events.iter().position(|event| predicate(event))
1010+
events.iter().position(predicate)
10111011
}
10121012

10131013
#[tokio::test]
@@ -1120,7 +1120,7 @@ mod tests {
11201120
.iter()
11211121
.filter(|message| message.role == RunMessageRole::Assistant)
11221122
.filter_map(|message| message.text.as_deref())
1123-
.last()
1123+
.next_back()
11241124
.expect("closing assistant turn should carry text");
11251125
assert_eq!(final_answer, streamed_answer);
11261126
}

‎src/reloaded-code-serdesai/src/agent_runtime/task.rs‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ mod tests {
10761076

10771077
/// Model settings overrides: applied per run, merged over the agent's
10781078
/// configured settings, with prompt-prepend behavior untouched.
1079-
1079+
///
10801080
/// Run hook that installs fixed model settings overrides before
10811081
/// delegating to `original`.
10821082
struct OverridingRunHook {
@@ -1188,17 +1188,18 @@ mod tests {
11881188

11891189
hooked.run("hello", ()).await.expect("run should complete");
11901190

1191-
let seen = captured
1192-
.lock()
1193-
.expect("captured settings should not be poisoned");
1194-
assert_eq!(seen.len(), 1, "one model request should have been made");
1195-
assert_eq!(seen[0].temperature, Some(f64::from(0.9_f32)));
1196-
assert_eq!(
1197-
seen[0].top_p,
1198-
Some(f64::from(0.8_f32)),
1199-
"agent-configured top_p should be retained"
1200-
);
1201-
drop(seen);
1191+
{
1192+
let seen = captured
1193+
.lock()
1194+
.expect("captured settings should not be poisoned");
1195+
assert_eq!(seen.len(), 1, "one model request should have been made");
1196+
assert_eq!(seen[0].temperature, Some(f64::from(0.9_f32)));
1197+
assert_eq!(
1198+
seen[0].top_p,
1199+
Some(f64::from(0.8_f32)),
1200+
"agent-configured top_p should be retained"
1201+
);
1202+
}
12021203

12031204
// Mirror direction: a top_p-only override replaces top_p and keeps
12041205
// the agent-configured temperature.
@@ -1209,16 +1210,18 @@ mod tests {
12091210

12101211
hooked.run("hello", ()).await.expect("run should complete");
12111212

1212-
let seen = captured
1213-
.lock()
1214-
.expect("captured settings should not be poisoned");
1215-
assert_eq!(seen.len(), 1, "one model request should have been made");
1216-
assert_eq!(seen[0].top_p, Some(f64::from(0.6_f32)));
1217-
assert_eq!(
1218-
seen[0].temperature,
1219-
Some(f64::from(0.3_f32)),
1220-
"agent-configured temperature should be retained"
1221-
);
1213+
{
1214+
let seen = captured
1215+
.lock()
1216+
.expect("captured settings should not be poisoned");
1217+
assert_eq!(seen.len(), 1, "one model request should have been made");
1218+
assert_eq!(seen[0].top_p, Some(f64::from(0.6_f32)));
1219+
assert_eq!(
1220+
seen[0].temperature,
1221+
Some(f64::from(0.3_f32)),
1222+
"agent-configured temperature should be retained"
1223+
);
1224+
}
12221225
}
12231226

12241227
#[tokio::test]

0 commit comments

Comments
 (0)