From c39d9eab046b6fad5018a8aaeb5f0be48e041dbc Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Thu, 16 Dec 2021 13:51:45 -0700 Subject: [PATCH] Revert "Revert "Use underscore for hacky rust-analyzer script (#21386) (#21445)"" This reverts commit fbc519523f511e883c5d51fd4131e3cafe07d187. --- scripts/sed-i-all-rs-files-for-rust-analyzer.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/sed-i-all-rs-files-for-rust-analyzer.sh b/scripts/sed-i-all-rs-files-for-rust-analyzer.sh index 3aa8206ee2..4c14819a64 100755 --- a/scripts/sed-i-all-rs-files-for-rust-analyzer.sh +++ b/scripts/sed-i-all-rs-files-for-rust-analyzer.sh @@ -9,17 +9,17 @@ if [[ $1 = "doit" ]]; then # it's true that we put true just for truely-aligned lines # shellcheck disable=SC2046 # our rust files are sanely named with no need to escape true && - sed -i -e 's/#\[cfg(test)\]/#[cfg(escaped-cfg-test)]/g' $(git ls-files :**.rs :^**/build.rs) && - sed -i -e 's/#\[bench\]/#[cfg(escaped-bench)]/g' $(git ls-files :**.rs :^**/build.rs) && - sed -i -e 's/#\[test\]/#[cfg(escaped-test)]/g' $(git ls-files :**.rs :^**/build.rs) && - sed -i -e 's/#\[tokio::test\]/#[cfg(escaped-tokio-test)]/g' $(git ls-files :**.rs :^**/build.rs) + sed -i -e 's/#\[cfg(test)\]/#[cfg(escaped_cfg_test)]/g' $(git ls-files :**.rs :^**/build.rs) && + sed -i -e 's/#\[bench\]/#[cfg(escaped_bench)]/g' $(git ls-files :**.rs :^**/build.rs) && + sed -i -e 's/#\[test\]/#[cfg(escaped_test)]/g' $(git ls-files :**.rs :^**/build.rs) && + sed -i -e 's/#\[tokio::test\]/#[cfg(escaped_tokio_test)]/g' $(git ls-files :**.rs :^**/build.rs) elif [[ $1 = "undoit" ]]; then # shellcheck disable=SC2046 # our rust files are sanely named with no need to escape true && - sed -i -e 's/#\[cfg(escaped-cfg-test)\]/#[cfg(test)]/g' $(git ls-files :**.rs :^**/build.rs) && - sed -i -e 's/#\[cfg(escaped-bench)\]/#[bench]/g' $(git ls-files :**.rs :^**/build.rs) && - sed -i -e 's/#\[cfg(escaped-test)\]/#[test]/g' $(git ls-files :**.rs :^**/build.rs) && - sed -i -e 's/#\[cfg(escaped-tokio-test)\]/#[tokio::test]/g' $(git ls-files :**.rs :^**/build.rs) + sed -i -e 's/#\[cfg(escaped_cfg_test)\]/#[cfg(test)]/g' $(git ls-files :**.rs :^**/build.rs) && + sed -i -e 's/#\[cfg(escaped_bench)\]/#[bench]/g' $(git ls-files :**.rs :^**/build.rs) && + sed -i -e 's/#\[cfg(escaped_test)\]/#[test]/g' $(git ls-files :**.rs :^**/build.rs) && + sed -i -e 's/#\[cfg(escaped_tokio_test)\]/#[tokio::test]/g' $(git ls-files :**.rs :^**/build.rs) else echo "usage: $0 [doit|undoit]" > /dev/stderr exit 1