clippy fix

jonmmease · Jan 27, 2024 · 9709b72 · 9709b72
1 parent c4640c9
commit 9709b72
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/sg2d-wgpu/src/marks/arc.rs b/sg2d-wgpu/src/marks/arc.rs
@@ -182,8 +182,8 @@ impl ArcShader {
             texture_size,
             shader: format!(
                 "{}\n{}",
-                include_str!("arc.wgsl").to_string(),
-                include_str!("gradient.wgsl").to_string()
+                include_str!("arc.wgsl"),
+                include_str!("gradient.wgsl")
             ),
             vertex_entry_point: "vs_main".to_string(),
             fragment_entry_point: "fs_main".to_string(),

diff --git a/sg2d-wgpu/src/marks/path.rs b/sg2d-wgpu/src/marks/path.rs
@@ -149,8 +149,8 @@ impl PathShader {
             texture_size,
             shader: format!(
                 "{}\n{}",
-                include_str!("path.wgsl").to_string(),
-                include_str!("gradient.wgsl").to_string()
+                include_str!("path.wgsl"),
+                include_str!("gradient.wgsl")
             ),
             vertex_entry_point: "vs_main".to_string(),
             fragment_entry_point: "fs_main".to_string(),
@@ -273,8 +273,8 @@ impl PathShader {
             texture_size,
             shader: format!(
                 "{}\n{}",
-                include_str!("path.wgsl").to_string(),
-                include_str!("gradient.wgsl").to_string()
+                include_str!("path.wgsl"),
+                include_str!("gradient.wgsl")
             ),
             vertex_entry_point: "vs_main".to_string(),
             fragment_entry_point: "fs_main".to_string(),
@@ -416,8 +416,8 @@ impl PathShader {
             texture_size,
             shader: format!(
                 "{}\n{}",
-                include_str!("path.wgsl").to_string(),
-                include_str!("gradient.wgsl").to_string()
+                include_str!("path.wgsl"),
+                include_str!("gradient.wgsl")
             ),
             vertex_entry_point: "vs_main".to_string(),
             fragment_entry_point: "fs_main".to_string(),
@@ -497,8 +497,8 @@ impl PathShader {
             texture_size,
             shader: format!(
                 "{}\n{}",
-                include_str!("path.wgsl").to_string(),
-                include_str!("gradient.wgsl").to_string()
+                include_str!("path.wgsl"),
+                include_str!("gradient.wgsl")
             ),
             vertex_entry_point: "vs_main".to_string(),
             fragment_entry_point: "fs_main".to_string(),

diff --git a/sg2d-wgpu/src/marks/rect.rs b/sg2d-wgpu/src/marks/rect.rs
@@ -92,8 +92,8 @@ impl RectInstance {
                 position: [*x, *y],
                 width: *width,
                 height: *height,
-                fill: to_color_or_gradient_coord(&fill, texture_size),
-                stroke: to_color_or_gradient_coord(&stroke, texture_size),
+                fill: to_color_or_gradient_coord(fill, texture_size),
+                stroke: to_color_or_gradient_coord(stroke, texture_size),
                 stroke_width: *stroke_width,
                 corner_radius: *corner_radius,
             })
@@ -145,8 +145,8 @@ impl RectShader {
             uniform: RectUniform::new(dimensions),
             shader: format!(
                 "{}\n{}",
-                include_str!("rect.wgsl").to_string(),
-                include_str!("gradient.wgsl").to_string()
+                include_str!("rect.wgsl"),
+                include_str!("gradient.wgsl")
             ),
             vertex_entry_point: "vs_main".to_string(),
             fragment_entry_point: "fs_main".to_string(),

diff --git a/sg2d-wgpu/src/marks/rule.rs b/sg2d-wgpu/src/marks/rule.rs
@@ -218,8 +218,8 @@ impl RuleShader {
             texture_size,
             shader: format!(
                 "{}\n{}",
-                include_str!("rule.wgsl").to_string(),
-                include_str!("gradient.wgsl").to_string()
+                include_str!("rule.wgsl"),
+                include_str!("gradient.wgsl")
             ),
             vertex_entry_point: "vs_main".to_string(),
             fragment_entry_point: "fs_main".to_string(),

diff --git a/sg2d-wgpu/src/marks/symbol.rs b/sg2d-wgpu/src/marks/symbol.rs
@@ -213,8 +213,8 @@ impl SymbolShader {
             texture_size,
             shader: format!(
                 "{}\n{}",
-                include_str!("symbol.wgsl").to_string(),
-                include_str!("gradient.wgsl").to_string()
+                include_str!("symbol.wgsl"),
+                include_str!("gradient.wgsl")
             ),
             vertex_entry_point: "vs_main".to_string(),
             fragment_entry_point: "fs_main".to_string(),