File tree Expand file tree Collapse file tree 7 files changed +13
-10
lines changed Expand file tree Collapse file tree 7 files changed +13
-10
lines changed Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ rustflags = [
40
40
" -Wclippy::map_err_ignore" ,
41
41
" -Wclippy::map_flatten" ,
42
42
" -Wclippy::map_unwrap_or" ,
43
- " -Wclippy::match_on_vec_items " ,
43
+ " -Wclippy::indexing_slicing " ,
44
44
" -Wclippy::match_same_arms" ,
45
45
" -Wclippy::match_wild_err_arm" ,
46
46
" -Wclippy::match_wildcard_for_single_variants" ,
Original file line number Diff line number Diff line change @@ -92,7 +92,7 @@ impl Assembler for CompiledAssembler {
92
92
. map_err ( |e| crate :: error:: Error {
93
93
inner : shared:: SpirvResult :: InvalidText ,
94
94
diagnostic : Some (
95
- format ! ( "spirv disassemble returned non-utf8 text: {}" , e ) . into ( ) ,
95
+ format ! ( "spirv disassemble returned non-utf8 text: {e}" ) . into ( ) ,
96
96
) ,
97
97
} ) ;
98
98
Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ impl Assembler for ToolAssembler {
65
65
String :: from_utf8 ( cmd_output. binary )
66
66
. map_err ( |e| crate :: error:: Error {
67
67
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 ( ) ) ,
69
69
} )
70
70
. map ( |s| if s. is_empty ( ) { None } else { Some ( s) } )
71
71
}
Original file line number Diff line number Diff line change @@ -179,7 +179,10 @@ pub fn exec(
179
179
return None ;
180
180
}
181
181
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
+ ) ,
183
186
None => ( self . haystack , & [ ] [ ..] ) ,
184
187
} ;
185
188
self . haystack = remaining;
Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ impl Optimizer for ToolOptimizer {
37
37
cmd. args (
38
38
self . passes
39
39
. 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}" ) ) ) ,
41
41
) ;
42
42
43
43
if self . use_perf_passes {
@@ -54,7 +54,7 @@ impl Optimizer for ToolOptimizer {
54
54
55
55
if let Some ( opts) = options {
56
56
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}" ) ) ;
58
58
}
59
59
60
60
if opts. preserve_bindings {
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ fn issue() {
34
34
. optimize (
35
35
& assembled,
36
36
& mut |msg| {
37
- eprintln ! ( "[tool] optimizer message: {:#?}" , msg ) ;
37
+ eprintln ! ( "[tool] optimizer message: {msg :#?}" ) ;
38
38
} ,
39
39
None ,
40
40
)
@@ -44,7 +44,7 @@ fn issue() {
44
44
. optimize (
45
45
& assembled,
46
46
& mut |msg| {
47
- eprintln ! ( "[compiled] optimizer message: {:#?}" , msg ) ;
47
+ eprintln ! ( "[compiled] optimizer message: {msg :#?}" ) ;
48
48
} ,
49
49
None ,
50
50
)
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ fn compiled_matches_binary() {
25
25
. optimize (
26
26
& assembled,
27
27
& mut |msg| {
28
- eprintln ! ( "[tool] optimizer message: {:#?}" , msg ) ;
28
+ eprintln ! ( "[tool] optimizer message: {msg :#?}" ) ;
29
29
} ,
30
30
None ,
31
31
)
@@ -35,7 +35,7 @@ fn compiled_matches_binary() {
35
35
. optimize (
36
36
& assembled,
37
37
& mut |msg| {
38
- eprintln ! ( "[compiled] optimizer message: {:#?}" , msg ) ;
38
+ eprintln ! ( "[compiled] optimizer message: {msg :#?}" ) ;
39
39
} ,
40
40
None ,
41
41
)
You can’t perform that action at this time.
0 commit comments