Skip to content
This repository was archived by the owner on Apr 11, 2026. It is now read-only.

Commit 019aaef

Browse files
z23ccclaude
andcommitted
chore: upgrade Rust edition 2021 → 2024 (MSRV 1.85)
Fix 6 edition 2024 pattern matching changes: - dag.rs: remove explicit & in filter/map patterns (4 sites) - lifecycle.rs: remove explicit ref in if-let pattern - crud.rs: remove explicit & dereference in filter pattern 319 tests pass. No behavioral changes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 9f34024 commit 019aaef

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

bin/flowctl

-84 KB
Binary file not shown.

flowctl/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ members = [
77

88
# ── Shared package metadata (nushell convention) ──────────────────────
99
[workspace.package]
10-
edition = "2021"
11-
rust-version = "1.80"
10+
edition = "2024"
11+
rust-version = "1.85"
1212
license = "MIT"
1313
repository = "https://github.com/z23cc/flow-code"
1414

flowctl/crates/flowctl-cli/src/commands/epic/crud.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pub fn cmd_set_plan(id: &str, file: Option<&str>, spec: Option<&str>, json_mode:
131131
}
132132
let duplicates: Vec<String> = seen
133133
.iter()
134-
.filter(|(_, &count)| count > 1)
134+
.filter(|(_, count)| **count > 1)
135135
.map(|(h, count)| format!("Duplicate heading: {h} (found {count} times)"))
136136
.collect();
137137
if !duplicates.is_empty() {

flowctl/crates/flowctl-core/src/dag.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ impl TaskDag {
187187

188188
let mut queue: VecDeque<NodeIndex> = in_degree
189189
.iter()
190-
.filter(|(_, &deg)| deg == 0)
191-
.map(|(&ni, _)| ni)
190+
.filter(|(_, deg)| **deg == 0)
191+
.map(|(ni, _)| *ni)
192192
.collect();
193193

194194
let mut processed = 0usize;
@@ -210,8 +210,8 @@ impl TaskDag {
210210
// Nodes with remaining in-degree > 0 are in cycles.
211211
let mut cycle_members: Vec<String> = in_degree
212212
.iter()
213-
.filter(|(_, &deg)| deg > 0)
214-
.map(|(&ni, _)| self.graph[ni].clone())
213+
.filter(|(_, deg)| **deg > 0)
214+
.map(|(ni, _)| self.graph[*ni].clone())
215215
.collect();
216216
cycle_members.sort();
217217
Some(cycle_members)
@@ -250,14 +250,14 @@ impl TaskDag {
250250
}
251251

252252
// Find the node with the maximum distance (end of critical path).
253-
let (&end_node, _) = dist.iter().max_by_key(|(_, &d)| d).unwrap();
253+
let (end_node, _) = dist.iter().max_by_key(|(_, d)| *d).unwrap();
254254

255255
// Trace back.
256-
let mut path = vec![end_node];
257-
let mut current = end_node;
258-
while let Some(&p) = pred.get(&current) {
259-
path.push(p);
260-
current = p;
256+
let mut path = vec![*end_node];
257+
let mut current = *end_node;
258+
while let Some(p) = pred.get(&current) {
259+
path.push(*p);
260+
current = *p;
261261
}
262262
path.reverse();
263263

@@ -354,8 +354,8 @@ impl TaskDag {
354354

355355
let mut queue: VecDeque<NodeIndex> = in_degree
356356
.iter()
357-
.filter(|(_, &deg)| deg == 0)
358-
.map(|(&ni, _)| ni)
357+
.filter(|(_, deg)| **deg == 0)
358+
.map(|(ni, _)| *ni)
359359
.collect();
360360

361361
let mut order = Vec::with_capacity(node_count);

flowctl/crates/flowctl-core/src/lifecycle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ fn validate_done_request(
328328
}
329329
}
330330

331-
if let Some(ref rt) = runtime {
331+
if let Some(rt) = runtime {
332332
if let Some(ref assignee) = rt.assignee {
333333
if assignee != &req.actor {
334334
return Err(ServiceError::CrossActorViolation(format!(

0 commit comments

Comments
 (0)