clippy fix

Author: jakobhellermann

examples/schedule_graph_testing.rs

@@ -79,11 +79,11 @@ fn print_schedule(schedule: &Schedule, schedule_label: &dyn ScheduleLabel) {
         }
     };
 
-    println!("{:?}", schedule_label);
+    println!("{schedule_label:?}");
 
     println!("- SETS");
     for (_set_id, set, _conditions) in graph.system_sets() {
-        println!("  - {:?}", set);
+        println!("  - {set:?}");
     }
 
     println!("- SYSTEMS");

src/cli.rs

@@ -142,12 +142,12 @@ fn execute_cli(app: &mut App) -> Result<Args> {
     let write = |out: &str| -> Result<()> {
         match &args.out_path {
             None => {
-                println!("{}", out);
+                println!("{out}");
                 Ok(())
             }
             Some(path) => {
                 let mut out_file = File::create(path)?;
-                write!(out_file, "{}", out)?;
+                write!(out_file, "{out}")?;
                 Ok(())
             }
         }

src/dot.rs

@@ -37,7 +37,7 @@ fn format_attributes(attrs: &[(&str, &str)]) -> String {
         .map(|(a, b)| format!("{}={}", escape_id(a), escape_id(b)))
         .collect();
     let attrs = attrs.join(", ");
-    format!("[{}]", attrs)
+    format!("[{attrs}]")
 }
 pub fn font_tag(text: &str, color: &str, size: u8) -> String {
     if text.is_empty() {
@@ -78,7 +78,7 @@ impl DotGraph {
         DotGraph::new(name, "digraph", options)
     }
     pub fn subgraph(name: &str, options: &[(&str, &str)]) -> DotGraph {
-        DotGraph::new(&format!("cluster{}", name), "subgraph", options)
+        DotGraph::new(&format!("cluster{name}"), "subgraph", options)
     }
 
     #[allow(dead_code)]

src/lib.rs

@@ -27,7 +27,7 @@ pub fn schedule_graph_dot(
         .resource_scope::<Schedules, _>(|world, mut schedules| {
             let ignored_ambiguities = schedules.ignored_scheduling_ambiguities.clone();
 
-            let label_name = format!("{:?}", label);
+            let label_name = format!("{label:?}");
             let schedule = schedules
                 .get_mut(label)
                 .ok_or_else(|| format!("schedule {label_name} doesn't exist"))

src/render_graph/mod.rs

@@ -34,7 +34,7 @@ fn build_dot_graph(
     settings: &Settings,
     subgraph_nest_level: usize,
 ) {
-    let fmt_label = |label: Interned<dyn RenderLabel>| format!("{:?}", label);
+    let fmt_label = |label: Interned<dyn RenderLabel>| format!("{label:?}");
 
     let node_mapping: HashMap<_, _> = graph
         .iter_nodes()
@@ -62,11 +62,11 @@ fn build_dot_graph(
     let next_layer_style =
         &settings.style.layers[(subgraph_nest_level + 1) % settings.style.layers.len()];
 
-    for (name, subgraph) in sorted(graph.iter_sub_graphs(), |(name, _)| format!("{:?}", name)) {
+    for (name, subgraph) in sorted(graph.iter_sub_graphs(), |(name, _)| format!("{name:?}")) {
         let internal_name = format!("{}_{:?}", graph_name.unwrap_or_default(), name);
         let mut sub_dot = DotGraph::subgraph(
             &internal_name,
-            &[("label", &format!("{:?}", name)), ("fontcolor", "red")],
+            &[("label", &format!("{name:?}")), ("fontcolor", "red")],
         )
         .graph_attributes(&[
             ("style", "rounded,filled"),
@@ -94,7 +94,7 @@ fn build_dot_graph(
             .map(|(index, slot)| {
                 format!(
                     "<TD PORT=\"{}\">{}: {}</TD>",
-                    html_escape(&format!("in-{}", index)),
+                    html_escape(&format!("in-{index}")),
                     html_escape(&slot.name),
                     html_escape(&format!("{:?}", slot.slot_type))
                 )
@@ -108,7 +108,7 @@ fn build_dot_graph(
             .map(|(index, slot)| {
                 format!(
                     "<TD PORT=\"{}\">{}: {}</TD>",
-                    html_escape(&format!("out-{}", index)),
+                    html_escape(&format!("out-{index}")),
                     html_escape(&slot.name),
                     html_escape(&format!("{:?}", slot.slot_type))
                 )
@@ -117,12 +117,12 @@ fn build_dot_graph(
 
         let slots = iter_utils::zip_longest(inputs.iter(), outputs.iter())
             .map(|pair| match pair {
-                EitherOrBoth::Both(input, output) => format!("<TR>{}{}</TR>", input, output),
+                EitherOrBoth::Both(input, output) => format!("<TR>{input}{output}</TR>"),
                 EitherOrBoth::Left(input) => {
-                    format!("<TR>{}<TD BORDER=\"0\">&nbsp;</TD></TR>", input)
+                    format!("<TR>{input}<TD BORDER=\"0\">&nbsp;</TD></TR>")
                 }
                 EitherOrBoth::Right(output) => {
-                    format!("<TR><TD BORDER=\"0\">&nbsp;</TD>{}</TR>", output)
+                    format!("<TR><TD BORDER=\"0\">&nbsp;</TD>{output}</TR>")
                 }
             })
             .collect::<String>();
@@ -155,9 +155,9 @@ fn build_dot_graph(
                 } => {
                     dot.add_edge_with_ports(
                         &node_id(output_node),
-                        Some(&format!("out-{}:e", output_index)),
+                        Some(&format!("out-{output_index}:e")),
                         &node_id(input_node),
-                        Some(&format!("in-{}:w", input_index)),
+                        Some(&format!("in-{input_index}:w")),
                         &[("color", &layer_style.color_edge_slot)],
                     );
                 }

src/schedule_graph/mod.rs

@@ -652,11 +652,11 @@ fn set_cluster_name(id: NodeId) -> String {
 }
 
 fn node_index_name(node_id: NodeId) -> String {
-    format!("node_{:?}", node_id)
+    format!("node_{node_id:?}")
 }
 fn marker_name(node_id: NodeId) -> String {
     assert!(node_id.is_set());
-    format!("set_marker_node_{:?}", node_id)
+    format!("set_marker_node_{node_id:?}")
 }
 
 enum IterSingleResult<T> {
@@ -774,7 +774,7 @@ fn remove_transitive_edges(graph: &mut DiGraph) {
             graph.remove_edge(visiting, n);
 
             reachable.clear();
-            collect_reachable(&mut reachable, &graph, visiting, Direction::Outgoing);
+            collect_reachable(&mut reachable, graph, visiting, Direction::Outgoing);
 
             // if we still can access a neighbour with a longer path, it's a transitive dependency.
             if !reachable.contains(&n) {

src/schedule_graph/settings.rs

@@ -320,5 +320,5 @@ pub fn full_system_name(system: &ScheduleSystem) -> String {
 }
 
 pub fn default_system_set_name(system_set: &dyn SystemSet) -> String {
-    format!("{:?}", system_set)
+    format!("{system_set:?}")
 }