Skip to content

Commit 8a7531d

Browse files
ZalatharZalathar
committed
Remove the temporary line-break preservers
1 parent 8b29afc commit 8a7531d

File tree

2 files changed

+19
-72
lines changed

2 files changed

+19
-72
lines changed

‎src/tools/compiletest/src/directives.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,10 +1465,7 @@ fn split_flags(flags: &str) -> Vec<String> {
14651465
flags
14661466
.split('\'')
14671467
.enumerate()
1468-
.flat_map(|(i, f)| {
1469-
// (preserve line breaks)
1470-
if i % 2 == 1 { vec![f] } else { f.split_whitespace().collect() }
1471-
})
1468+
.flat_map(|(i, f)| if i % 2 == 1 { vec![f] } else { f.split_whitespace().collect() })
14721469
.map(move |s| s.to_owned())
14731470
.collect::<Vec<_>>()
14741471
}

‎src/tools/compiletest/src/directives/handlers.rs‎

Lines changed: 18 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ fn make_directive_handlers_map() -> HashMap<&'static str, Handler> {
8989
&& flags.get(i + 1).is_some_and(|v| v.starts_with("incremental=")))
9090
|| flag.starts_with("-Cincremental=")
9191
{
92-
panic!(
93-
// (preserve line breaks)
94-
"you must use `//@ incremental` to enable incremental compilation"
95-
);
92+
panic!("you must use `//@ incremental` to enable incremental compilation");
9693
}
9794
}
9895
props.compile_flags.extend(flags);
@@ -123,12 +120,7 @@ fn make_directive_handlers_map() -> HashMap<&'static str, Handler> {
123120
config.set_name_directive(ln, BUILD_AUX_DOCS, &mut props.build_aux_docs);
124121
}),
125122
handler(UNIQUE_DOC_OUT_DIR, |config, ln, props| {
126-
config.set_name_directive(
127-
// (preserve line breaks)
128-
ln,
129-
UNIQUE_DOC_OUT_DIR,
130-
&mut props.unique_doc_out_dir,
131-
);
123+
config.set_name_directive(ln, UNIQUE_DOC_OUT_DIR, &mut props.unique_doc_out_dir);
132124
}),
133125
handler(FORCE_HOST, |config, ln, props| {
134126
config.set_name_directive(ln, FORCE_HOST, &mut props.force_host);
@@ -162,12 +154,7 @@ fn make_directive_handlers_map() -> HashMap<&'static str, Handler> {
162154
}
163155
}),
164156
handler(PRETTY_COMPARE_ONLY, |config, ln, props| {
165-
config.set_name_directive(
166-
// (preserve line breaks)
167-
ln,
168-
PRETTY_COMPARE_ONLY,
169-
&mut props.pretty_compare_only,
170-
);
157+
config.set_name_directive(ln, PRETTY_COMPARE_ONLY, &mut props.pretty_compare_only);
171158
}),
172159
multi_handler(
173160
&[AUX_BUILD, AUX_BIN, AUX_CRATE, PROC_MACRO, AUX_CODEGEN_BACKEND],
@@ -177,22 +164,12 @@ fn make_directive_handlers_map() -> HashMap<&'static str, Handler> {
177164
},
178165
),
179166
handler(EXEC_ENV, |config, ln, props| {
180-
config.push_name_value_directive(
181-
// (preserve line breaks)
182-
ln,
183-
EXEC_ENV,
184-
&mut props.exec_env,
185-
Config::parse_env,
186-
);
167+
config.push_name_value_directive(ln, EXEC_ENV, &mut props.exec_env, Config::parse_env);
187168
}),
188169
handler(UNSET_EXEC_ENV, |config, ln, props| {
189-
config.push_name_value_directive(
190-
// (preserve line breaks)
191-
ln,
192-
UNSET_EXEC_ENV,
193-
&mut props.unset_exec_env,
194-
|r| r.trim().to_owned(),
195-
);
170+
config.push_name_value_directive(ln, UNSET_EXEC_ENV, &mut props.unset_exec_env, |r| {
171+
r.trim().to_owned()
172+
});
196173
}),
197174
handler(RUSTC_ENV, |config, ln, props| {
198175
config.push_name_value_directive(
@@ -211,13 +188,7 @@ fn make_directive_handlers_map() -> HashMap<&'static str, Handler> {
211188
);
212189
}),
213190
handler(FORBID_OUTPUT, |config, ln, props| {
214-
config.push_name_value_directive(
215-
// (preserve line breaks)
216-
ln,
217-
FORBID_OUTPUT,
218-
&mut props.forbid_output,
219-
|r| r,
220-
);
191+
config.push_name_value_directive(ln, FORBID_OUTPUT, &mut props.forbid_output, |r| r);
221192
}),
222193
handler(CHECK_TEST_LINE_NUMBERS_MATCH, |config, ln, props| {
223194
config.set_name_directive(
@@ -293,21 +264,12 @@ fn make_directive_handlers_map() -> HashMap<&'static str, Handler> {
293264
);
294265
}),
295266
handler(ASSEMBLY_OUTPUT, |config, ln, props| {
296-
config.set_name_value_directive(
297-
// (preserve line breaks)
298-
ln,
299-
ASSEMBLY_OUTPUT,
300-
&mut props.assembly_output,
301-
|r| r.trim().to_string(),
302-
);
267+
config.set_name_value_directive(ln, ASSEMBLY_OUTPUT, &mut props.assembly_output, |r| {
268+
r.trim().to_string()
269+
});
303270
}),
304271
handler(STDERR_PER_BITWIDTH, |config, ln, props| {
305-
config.set_name_directive(
306-
// (preserve line breaks)
307-
ln,
308-
STDERR_PER_BITWIDTH,
309-
&mut props.stderr_per_bitwidth,
310-
);
272+
config.set_name_directive(ln, STDERR_PER_BITWIDTH, &mut props.stderr_per_bitwidth);
311273
}),
312274
handler(INCREMENTAL, |config, ln, props| {
313275
config.set_name_directive(ln, INCREMENTAL, &mut props.incremental);
@@ -322,10 +284,7 @@ fn make_directive_handlers_map() -> HashMap<&'static str, Handler> {
322284
issue_ref
323285
.trim()
324286
.split_once('#')
325-
.filter(|(_, number)| {
326-
// (preserve line breaks)
327-
number.chars().all(|digit| digit.is_numeric())
328-
})
287+
.filter(|(_, number)| number.chars().all(|digit| digit.is_numeric()))
329288
.is_some()
330289
})
331290
{
@@ -342,13 +301,9 @@ fn make_directive_handlers_map() -> HashMap<&'static str, Handler> {
342301
}
343302
}),
344303
handler(TEST_MIR_PASS, |config, ln, props| {
345-
config.set_name_value_directive(
346-
// (preserve line breaks)
347-
ln,
348-
TEST_MIR_PASS,
349-
&mut props.mir_unit_test,
350-
|s| s.trim().to_string(),
351-
);
304+
config.set_name_value_directive(ln, TEST_MIR_PASS, &mut props.mir_unit_test, |s| {
305+
s.trim().to_string()
306+
});
352307
}),
353308
handler(REMAP_SRC_BASE, |config, ln, props| {
354309
config.set_name_directive(ln, REMAP_SRC_BASE, &mut props.remap_src_base);
@@ -370,10 +325,7 @@ fn make_directive_handlers_map() -> HashMap<&'static str, Handler> {
370325
props.update_add_core_stubs(ln, config);
371326
}),
372327
handler(CORE_STUBS_COMPILE_FLAGS, |config, ln, props| {
373-
if let Some(flags) =
374-
// (preserve line breaks)
375-
config.parse_name_value_directive(ln, CORE_STUBS_COMPILE_FLAGS)
376-
{
328+
if let Some(flags) = config.parse_name_value_directive(ln, CORE_STUBS_COMPILE_FLAGS) {
377329
let flags = split_flags(&flags);
378330
for flag in &flags {
379331
if flag == "--edition" || flag.starts_with("--edition=") {
@@ -384,9 +336,7 @@ fn make_directive_handlers_map() -> HashMap<&'static str, Handler> {
384336
}
385337
}),
386338
handler(DONT_REQUIRE_ANNOTATIONS, |config, ln, props| {
387-
if let Some(err_kind) =
388-
// (preserve line breaks)
389-
config.parse_name_value_directive(ln, DONT_REQUIRE_ANNOTATIONS)
339+
if let Some(err_kind) = config.parse_name_value_directive(ln, DONT_REQUIRE_ANNOTATIONS)
390340
{
391341
props
392342
.dont_require_annotations

0 commit comments

Comments
 (0)