diff --git a/hive-c0re/src/job_queue/tests.rs b/hive-c0re/src/job_queue/tests.rs index a783bf91..bbf06d45 100644 --- a/hive-c0re/src/job_queue/tests.rs +++ b/hive-c0re/src/job_queue/tests.rs @@ -146,12 +146,12 @@ fn declared_shape(q: &JobQueue) -> Vec { fn declared_shape_filtered(q: &JobQueue, keep: &dyn Fn(&NodeKind) -> bool) -> Vec { let sched = q.sched().lock().expect("job_queue mutex poisoned"); let graph = sched.graph(); - let kind_of = |id: NodeId| graph.node(id).map(|n| n.payload.as_str()); + let kind_of = |id: NodeId| graph.node(id).map(|n| <&str>::from(&n.payload)); graph .nodes() .filter(|n| keep(&n.payload)) .map(|n| Declared { - kind: n.payload.as_str(), + kind: <&str>::from(&n.payload), parent: n.parent.and_then(kind_of), after: n .deps @@ -175,7 +175,7 @@ fn node_of(q: &JobQueue, kind: &str) -> hive_jobq::NodeId { let graph = sched.graph(); let mut found: Vec<_> = graph .nodes() - .filter(|n| n.payload.as_str() == kind) + .filter(|n| <&str>::from(&n.payload) == kind) .map(|n| n.id) .collect(); assert_eq!( @@ -225,7 +225,7 @@ fn pending_kinds_filtered(q: &JobQueue, keep: &dyn Fn(&NodeKind) -> bool) -> Vec graph .nodes() .filter(|n| n.state == State::Pending && keep(&n.payload)) - .map(|n| n.payload.as_str()) + .map(|n| <&str>::from(&n.payload)) .collect() } @@ -275,7 +275,7 @@ fn declared_resources_of_kind(q: &JobQueue, kind: &str) -> Vec> { let graph = sched.graph(); let mut rows: Vec> = graph .nodes() - .filter(|n| n.payload.as_str() == kind) + .filter(|n| <&str>::from(&n.payload) == kind) .map(|n| { n.deps .iter()