diff options
| author | The Miri Cronjob Bot <miri@cron.bot> | 2024-10-30 05:12:55 +0000 |
|---|---|---|
| committer | The Miri Cronjob Bot <miri@cron.bot> | 2024-10-30 05:12:55 +0000 |
| commit | 7d12e50f73e6c08b52da7715db413598a27f7ade (patch) | |
| tree | eb4ec242a3ced486b9baf95b2b8bf25ffa7fb7ba /src/etc | |
| parent | ff6e703bf14ed6f071aa01fd2231340c08d1312d (diff) | |
| parent | 7591eb60ad3b95d6e1937077f778791b063b5340 (diff) | |
| download | rust-7d12e50f73e6c08b52da7715db413598a27f7ade.tar.gz rust-7d12e50f73e6c08b52da7715db413598a27f7ade.zip | |
Merge from rustc
Diffstat (limited to 'src/etc')
| -rwxr-xr-x | src/etc/cat-and-grep.sh | 1 | ||||
| -rwxr-xr-x | src/etc/htmldocck.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/etc/cat-and-grep.sh b/src/etc/cat-and-grep.sh index 238f7f5b660..68c6993ac15 100755 --- a/src/etc/cat-and-grep.sh +++ b/src/etc/cat-and-grep.sh @@ -33,7 +33,6 @@ while getopts ':vieh' OPTION; do case "$OPTION" in v) INVERT=1 - ERROR_MSG='should not be found' ;; i) GREPFLAGS="i$GREPFLAGS" 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" |