@@ -78,8 +78,7 @@ fn inner(
78
78
dump_cmds : bool ,
79
79
dump_finds : bool ,
80
80
) -> Option < ( ) > {
81
- let gen_time = load_systemtime ( fp) ?;
82
- eprintln ! ( "Stamp generated at {gen_time:?}" ) ;
81
+ let _gen_time = load_systemtime ( fp) ?;
83
82
84
83
//
85
84
// See regen.rs check_step1 for how this is read normally
@@ -89,7 +88,7 @@ fn inner(
89
88
let files = load_vec_string ( fp) ?;
90
89
if dump_files {
91
90
for file in files {
92
- println ! ( "{file:?}" ) ;
91
+ println ! ( "{}" , file . display ( ) ) ;
93
92
}
94
93
}
95
94
}
@@ -98,7 +97,7 @@ fn inner(
98
97
let undefined = load_vec_string ( fp) ?;
99
98
if dump_env {
100
99
for var in undefined {
101
- println ! ( "undefined: {var:?}" ) ;
100
+ println ! ( "undefined: {}" , var . display ( ) ) ;
102
101
}
103
102
}
104
103
}
@@ -108,7 +107,7 @@ fn inner(
108
107
let name = load_string ( fp) ?;
109
108
let value = load_string ( fp) ?;
110
109
if dump_env {
111
- println ! ( "{name:? }: {value:?}" ) ;
110
+ println ! ( "{}: {}" , name . display ( ) , value . display ( ) ) ;
112
111
}
113
112
}
114
113
@@ -118,10 +117,10 @@ fn inner(
118
117
119
118
let files = load_vec_string ( fp) ?;
120
119
if dump_globs {
121
- println ! ( "{pat:?}" ) ;
120
+ println ! ( "{}" , pat . display ( ) ) ;
122
121
123
122
for s in files {
124
- println ! ( " {s:?}" ) ;
123
+ println ! ( " {}" , s . display ( ) ) ;
125
124
}
126
125
}
127
126
}
@@ -146,49 +145,50 @@ fn inner(
146
145
147
146
if dump_finds {
148
147
println ! ( "cmd type: FIND" ) ;
149
- println ! ( " shell: {shell:?}" ) ;
150
- println ! ( " shell flagss: {shellflag:?}" ) ;
151
- println ! ( " loc: {file:? }:{line}" ) ;
152
- println ! ( " cmd: {cmd:?}" ) ;
148
+ println ! ( " shell: {}" , shell . display ( ) ) ;
149
+ println ! ( " shell flagss: {}" , shellflag . display ( ) ) ;
150
+ println ! ( " loc: {}:{line}" , file . display ( ) ) ;
151
+ println ! ( " cmd: {}" , cmd . display ( ) ) ;
153
152
if !result. is_empty ( ) && result. len ( ) < 500 && !result. as_bytes ( ) . contains ( & b'\n' ) {
154
- println ! ( " output: {result:?}" ) ;
153
+ println ! ( " output: {}" , result . display ( ) ) ;
155
154
} else {
156
155
println ! ( " output: <{} bytes>" , result. len( ) ) ;
157
156
}
158
157
println ! ( " missing dirs:" ) ;
159
158
for d in missing_dirs {
160
- println ! ( " {d:?}" ) ;
159
+ println ! ( " {}" , d . display ( ) ) ;
161
160
}
162
161
println ! ( " files:" ) ;
163
162
for f in files {
164
- println ! ( " {f:?}" ) ;
163
+ println ! ( " {}" , f . display ( ) ) ;
165
164
}
166
165
println ! ( " read dirs:" ) ;
167
166
for d in read_dirs {
168
- println ! ( " {d:?}" ) ;
167
+ println ! ( " {}" , d . display ( ) ) ;
169
168
}
170
169
println ! ( ) ;
171
170
}
172
171
} else if dump_cmds {
173
172
match op {
174
173
CommandOp :: Shell => {
175
174
println ! ( "cmd type: SHELL" ) ;
176
- println ! ( " shell: {shell:?}" ) ;
177
- println ! ( " shell flagss: {shellflag:?}" ) ;
175
+ println ! ( " shell: {}" , shell . display ( ) ) ;
176
+ println ! ( " shell flagss: {}" , shellflag . display ( ) ) ;
178
177
}
179
178
CommandOp :: Read => println ! ( "cmd type: READ" ) ,
180
179
CommandOp :: ReadMissing => println ! ( "cmd type: READ_MISSING" ) ,
181
180
CommandOp :: Write => println ! ( "cmd type: WRITE" ) ,
182
181
CommandOp :: Append => println ! ( "cmd type: APPEND" ) ,
183
182
CommandOp :: Find => unreachable ! ( ) ,
184
183
}
185
- println ! ( " loc: {file:? }:{line}" ) ;
186
- println ! ( " cmd: {cmd:?}" ) ;
184
+ println ! ( " loc: {}:{line}" , file . display ( ) ) ;
185
+ println ! ( " cmd: {}" , cmd . display ( ) ) ;
187
186
if !result. is_empty ( ) && result. len ( ) < 500 && !result. as_bytes ( ) . contains ( & b'\n' ) {
188
- println ! ( " output: {result:?}" ) ;
187
+ println ! ( " output: {}" , result . display ( ) ) ;
189
188
} else {
190
189
println ! ( " output: <{} bytes>" , result. len( ) ) ;
191
190
}
191
+ println ! ( ) ;
192
192
}
193
193
}
194
194
0 commit comments