about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-09-15 23:12:44 +0000
committerbors <bors@rust-lang.org>2022-09-15 23:12:44 +0000
commitbb3bac0373b44e77252ee92dda77ff76c7094f03 (patch)
tree7cf731707919bece3af897b0b9a4d4bd94b4a9a2
parent2f1fa12659ac6b852a9dec46b79a0b02736f4e44 (diff)
parenta094296e8b86f34d19c2441bb33d14addf146cfd (diff)
downloadrust-bb3bac0373b44e77252ee92dda77ff76c7094f03.tar.gz
rust-bb3bac0373b44e77252ee92dda77ff76c7094f03.zip
Auto merge of #2544 - saethlin:egrep, r=saethlin
Don't use egrep, we don't need it

As of a few days ago, the latest version of `egrep` is now this:
```sh
#!/bin/sh
cmd=${0##*/}
echo "$cmd: warning: $cmd is obsolescent; using grep -E" >&2
exec grep -E "$`@"`
```
Fortunately we don't actually need ERE, so we can just drop the e.
-rwxr-xr-xrustup-toolchain2
1 files changed, 1 insertions, 1 deletions
diff --git a/rustup-toolchain b/rustup-toolchain
index 7b9a17145d0..d7730f2b06d 100755
--- a/rustup-toolchain
+++ b/rustup-toolchain
@@ -33,7 +33,7 @@ echo "$NEW_COMMIT" > rust-version
 shift || true # don't fail if shifting fails
 
 # Check if we already are at that commit.
-CUR_COMMIT=$(rustc +miri --version -v 2>/dev/null | egrep "^commit-hash: " | cut -d " " -f 2)
+CUR_COMMIT=$(rustc +miri --version -v 2>/dev/null | grep "^commit-hash: " | cut -d " " -f 2)
 if [[ "$CUR_COMMIT" == "$NEW_COMMIT" ]]; then
     echo "miri toolchain is already at commit $CUR_COMMIT."
     rustup override set miri