Skip to content

Commit bb7850a

Browse files
committed
Don't display quotes around strings in --dump_stamp_tool
To match ckati.
1 parent d18d2ee commit bb7850a

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

src-rs/regen_dump.rs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ fn inner(
7878
dump_cmds: bool,
7979
dump_finds: bool,
8080
) -> Option<()> {
81-
let gen_time = load_systemtime(fp)?;
82-
eprintln!("Stamp generated at {gen_time:?}");
81+
let _gen_time = load_systemtime(fp)?;
8382

8483
//
8584
// See regen.rs check_step1 for how this is read normally
@@ -89,7 +88,7 @@ fn inner(
8988
let files = load_vec_string(fp)?;
9089
if dump_files {
9190
for file in files {
92-
println!("{file:?}");
91+
println!("{}", file.display());
9392
}
9493
}
9594
}
@@ -98,7 +97,7 @@ fn inner(
9897
let undefined = load_vec_string(fp)?;
9998
if dump_env {
10099
for var in undefined {
101-
println!("undefined: {var:?}");
100+
println!("undefined: {}", var.display());
102101
}
103102
}
104103
}
@@ -108,7 +107,7 @@ fn inner(
108107
let name = load_string(fp)?;
109108
let value = load_string(fp)?;
110109
if dump_env {
111-
println!("{name:?}: {value:?}");
110+
println!("{}: {}", name.display(), value.display());
112111
}
113112
}
114113

@@ -118,10 +117,10 @@ fn inner(
118117

119118
let files = load_vec_string(fp)?;
120119
if dump_globs {
121-
println!("{pat:?}");
120+
println!("{}", pat.display());
122121

123122
for s in files {
124-
println!(" {s:?}");
123+
println!(" {}", s.display());
125124
}
126125
}
127126
}
@@ -146,49 +145,50 @@ fn inner(
146145

147146
if dump_finds {
148147
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());
153152
if !result.is_empty() && result.len() < 500 && !result.as_bytes().contains(&b'\n') {
154-
println!(" output: {result:?}");
153+
println!(" output: {}", result.display());
155154
} else {
156155
println!(" output: <{} bytes>", result.len());
157156
}
158157
println!(" missing dirs:");
159158
for d in missing_dirs {
160-
println!(" {d:?}");
159+
println!(" {}", d.display());
161160
}
162161
println!(" files:");
163162
for f in files {
164-
println!(" {f:?}");
163+
println!(" {}", f.display());
165164
}
166165
println!(" read dirs:");
167166
for d in read_dirs {
168-
println!(" {d:?}");
167+
println!(" {}", d.display());
169168
}
170169
println!();
171170
}
172171
} else if dump_cmds {
173172
match op {
174173
CommandOp::Shell => {
175174
println!("cmd type: SHELL");
176-
println!(" shell: {shell:?}");
177-
println!(" shell flagss: {shellflag:?}");
175+
println!(" shell: {}", shell.display());
176+
println!(" shell flagss: {}", shellflag.display());
178177
}
179178
CommandOp::Read => println!("cmd type: READ"),
180179
CommandOp::ReadMissing => println!("cmd type: READ_MISSING"),
181180
CommandOp::Write => println!("cmd type: WRITE"),
182181
CommandOp::Append => println!("cmd type: APPEND"),
183182
CommandOp::Find => unreachable!(),
184183
}
185-
println!(" loc: {file:?}:{line}");
186-
println!(" cmd: {cmd:?}");
184+
println!(" loc: {}:{line}", file.display());
185+
println!(" cmd: {}", cmd.display());
187186
if !result.is_empty() && result.len() < 500 && !result.as_bytes().contains(&b'\n') {
188-
println!(" output: {result:?}");
187+
println!(" output: {}", result.display());
189188
} else {
190189
println!(" output: <{} bytes>", result.len());
191190
}
191+
println!();
192192
}
193193
}
194194

0 commit comments

Comments
 (0)