Skip to content

Commit 6c5641c

Browse files
Rollup merge of rust-lang#132313 - Zalathar:directive-list, r=jieyouxu
compiletest: Rename `command-list.rs` to `directive-list.rs` Because I forget the name of this file literally every single time I need to find and edit it. r? jieyouxu
2 parents 0963636 + 6f82a95 commit 6c5641c

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/etc/htmldocck.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ def filter_line(line):
250250
os.path.join(
251251
# We go back to `src`.
252252
os.path.dirname(os.path.dirname(__file__)),
253-
"tools/compiletest/src/command-list.rs",
253+
"tools/compiletest/src/directive-list.rs",
254254
),
255255
"r",
256256
encoding="utf8"

src/tools/compiletest/src/header.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -709,11 +709,11 @@ fn line_directive<'line>(
709709
Some(DirectiveLine { line_number, revision, raw_directive })
710710
}
711711

712-
// To prevent duplicating the list of commmands between `compiletest`,`htmldocck` and `jsondocck`,
712+
// To prevent duplicating the list of directives between `compiletest`,`htmldocck` and `jsondocck`,
713713
// we put it into a common file which is included in rust code and parsed here.
714714
// FIXME: This setup is temporary until we figure out how to improve this situation.
715715
// See <https://github.com/rust-lang/rust/issues/125813#issuecomment-2141953780>.
716-
include!("command-list.rs");
716+
include!("directive-list.rs");
717717

718718
const KNOWN_HTMLDOCCK_DIRECTIVE_NAMES: &[&str] = &[
719719
"count",

src/tools/jsondocck/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ fn print_err(msg: &str, lineno: usize) {
123123

124124
// FIXME: This setup is temporary until we figure out how to improve this situation.
125125
// See <https://github.com/rust-lang/rust/issues/125813#issuecomment-2141953780>.
126-
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../compiletest/src/command-list.rs"));
126+
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../compiletest/src/directive-list.rs"));
127127

128128
/// Get a list of commands from a file. Does the work of ensuring the commands
129129
/// are syntactically valid.

0 commit comments

Comments
 (0)