diff options
| author | Zalathar <Zalathar@users.noreply.github.com> | 2024-10-29 17:39:13 +1100 |
|---|---|---|
| committer | Zalathar <Zalathar@users.noreply.github.com> | 2024-10-29 17:39:13 +1100 |
| commit | 6f82a952986bae1c2a21d439af7a3f7d86008e06 (patch) | |
| tree | 2b6c1936873446cd62dd5a808421e8b32468d106 | |
| parent | 3f1be1ec7ec3d8e80beb381ee82164a0aa3ca777 (diff) | |
| download | rust-6f82a952986bae1c2a21d439af7a3f7d86008e06.tar.gz rust-6f82a952986bae1c2a21d439af7a3f7d86008e06.zip | |
Rename `command-list.rs` to `directive-list.rs`
| -rwxr-xr-x | src/etc/htmldocck.py | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/directive-list.rs (renamed from src/tools/compiletest/src/command-list.rs) | 0 | ||||
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 4 | ||||
| -rw-r--r-- | src/tools/jsondocck/src/main.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/etc/htmldocck.py b/src/etc/htmldocck.py index 599e1e8102c..851b01a7458 100755 --- a/src/etc/htmldocck.py +++ b/src/etc/htmldocck.py @@ -250,7 +250,7 @@ def get_known_directive_names(): 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" diff --git a/src/tools/compiletest/src/command-list.rs b/src/tools/compiletest/src/directive-list.rs index 4d57907f26f..4d57907f26f 100644 --- a/src/tools/compiletest/src/command-list.rs +++ b/src/tools/compiletest/src/directive-list.rs diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index d75cdefe635..a3bf36c0e90 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -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", diff --git a/src/tools/jsondocck/src/main.rs b/src/tools/jsondocck/src/main.rs index b264405ac3e..c08bbbc769a 100644 --- a/src/tools/jsondocck/src/main.rs +++ b/src/tools/jsondocck/src/main.rs @@ -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. |