Skip to content

Commit

Permalink
Rollup merge of #132313 - Zalathar:directive-list, r=jieyouxu
Browse files Browse the repository at this point in the history
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
  • Loading branch information
workingjubilee authored Oct 29, 2024
2 parents 0963636 + 6f82a95 commit 6c5641c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/etc/htmldocck.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def filter_line(line):
os.path.join(
# We go back to `src`.
os.path.dirname(os.path.dirname(__file__)),
"tools/compiletest/src/command-list.rs",
"tools/compiletest/src/directive-list.rs",
),
"r",
encoding="utf8"
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/tools/compiletest/src/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -709,11 +709,11 @@ fn line_directive<'line>(
Some(DirectiveLine { line_number, revision, raw_directive })
}

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

const KNOWN_HTMLDOCCK_DIRECTIVE_NAMES: &[&str] = &[
"count",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/jsondocck/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ fn print_err(msg: &str, lineno: usize) {

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

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

0 comments on commit 6c5641c

Please sign in to comment.