Skip to content

Commit 8bee8b0

Browse files
committed
fix cargo clippy
1 parent 9e0cffc commit 8bee8b0

File tree

7 files changed

+13
-10
lines changed

7 files changed

+13
-10
lines changed

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ rustflags = [
4040
"-Wclippy::map_err_ignore",
4141
"-Wclippy::map_flatten",
4242
"-Wclippy::map_unwrap_or",
43-
"-Wclippy::match_on_vec_items",
43+
"-Wclippy::indexing_slicing",
4444
"-Wclippy::match_same_arms",
4545
"-Wclippy::match_wild_err_arm",
4646
"-Wclippy::match_wildcard_for_single_variants",

src/assembler/compiled.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl Assembler for CompiledAssembler {
9292
.map_err(|e| crate::error::Error {
9393
inner: shared::SpirvResult::InvalidText,
9494
diagnostic: Some(
95-
format!("spirv disassemble returned non-utf8 text: {}", e).into(),
95+
format!("spirv disassemble returned non-utf8 text: {e}").into(),
9696
),
9797
});
9898

src/assembler/tool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ impl Assembler for ToolAssembler {
6565
String::from_utf8(cmd_output.binary)
6666
.map_err(|e| crate::error::Error {
6767
inner: spirv_tools_sys::shared::SpirvResult::InvalidText,
68-
diagnostic: Some(format!("spirv disassemble returned non-utf8 text: {}", e).into()),
68+
diagnostic: Some(format!("spirv disassemble returned non-utf8 text: {e}").into()),
6969
})
7070
.map(|s| if s.is_empty() { None } else { Some(s) })
7171
}

src/cmd.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,10 @@ pub fn exec(
179179
return None;
180180
}
181181
let (ret, remaining) = match memchr::memchr(self.needle, self.haystack) {
182-
Some(pos) => (&self.haystack[..pos], &self.haystack[pos + 1..]),
182+
Some(pos) => (
183+
self.haystack.get(..pos).unwrap(),
184+
self.haystack.get(pos + 1..).unwrap(),
185+
),
183186
None => (self.haystack, &[][..]),
184187
};
185188
self.haystack = remaining;

src/opt/tool.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl Optimizer for ToolOptimizer {
3737
cmd.args(
3838
self.passes
3939
.iter()
40-
.filter_map(|p| pass_to_string(*p).map(|s| format!("--{}", s))),
40+
.filter_map(|p| pass_to_string(*p).map(|s| format!("--{s}"))),
4141
);
4242

4343
if self.use_perf_passes {
@@ -54,7 +54,7 @@ impl Optimizer for ToolOptimizer {
5454

5555
if let Some(opts) = options {
5656
if let Some(max_id_bound) = opts.max_id_bound {
57-
cmd.arg(format!("--max-id-bound={}", max_id_bound));
57+
cmd.arg(format!("--max-id-bound={max_id_bound}"));
5858
}
5959

6060
if opts.preserve_bindings {

tests/issue_22.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn issue() {
3434
.optimize(
3535
&assembled,
3636
&mut |msg| {
37-
eprintln!("[tool] optimizer message: {:#?}", msg);
37+
eprintln!("[tool] optimizer message: {msg:#?}");
3838
},
3939
None,
4040
)
@@ -44,7 +44,7 @@ fn issue() {
4444
.optimize(
4545
&assembled,
4646
&mut |msg| {
47-
eprintln!("[compiled] optimizer message: {:#?}", msg);
47+
eprintln!("[compiled] optimizer message: {msg:#?}");
4848
},
4949
None,
5050
)

tests/optimizer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn compiled_matches_binary() {
2525
.optimize(
2626
&assembled,
2727
&mut |msg| {
28-
eprintln!("[tool] optimizer message: {:#?}", msg);
28+
eprintln!("[tool] optimizer message: {msg:#?}");
2929
},
3030
None,
3131
)
@@ -35,7 +35,7 @@ fn compiled_matches_binary() {
3535
.optimize(
3636
&assembled,
3737
&mut |msg| {
38-
eprintln!("[compiled] optimizer message: {:#?}", msg);
38+
eprintln!("[compiled] optimizer message: {msg:#?}");
3939
},
4040
None,
4141
)

0 commit comments

Comments
 (0)