about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2022-07-21 12:24:13 +0000
committerOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2022-07-21 15:04:02 +0000
commitbfa2ff646c5830de1662576658f4ae69e207ffca (patch)
treeaabae9bcca16204b071e0ca1411f4a7e2bec8238
parent392342fcaf4c08c060d7ea7db2c03f3b5830def9 (diff)
downloadrust-bfa2ff646c5830de1662576658f4ae69e207ffca.tar.gz
rust-bfa2ff646c5830de1662576658f4ae69e207ffca.zip
Use a MIRI namespaced env var name for auto ops
-rw-r--r--CONTRIBUTING.md4
-rwxr-xr-xmiri4
2 files changed, 4 insertions, 4 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f6147bbbe53..42f77b5cbc0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -169,14 +169,14 @@ to `.vscode/settings.json` in your local Miri clone:
     ],
     "rust-analyzer.checkOnSave.overrideCommand": [
         "env",
-        "AUTO_OPS=42",
+        "MIRI_AUTO_OPS=no",
         "./miri",
         "check",
         "--message-format=json"
     ],
     "rust-analyzer.buildScripts.overrideCommand": [
         "env",
-        "AUTO_OPS=42",
+        "MIRI_AUTO_OPS=no",
         "./miri",
         "check",
         "--message-format=json",
diff --git a/miri b/miri
index 38f8e546aec..463e4607bae 100755
--- a/miri
+++ b/miri
@@ -53,8 +53,8 @@ EOF
 MIRIDIR=$(python3 -c 'import os, sys; print(os.path.dirname(os.path.realpath(sys.argv[1])))' "$0")
 
 ## Run the auto-things.
-if [ -z "$AUTO_OPS" ]; then
-    export AUTO_OPS=42
+if [ -z "$MIRI_AUTO_OPS" ]; then
+    export MIRI_AUTO_OPS=42
 
     # Run this first, so that the toolchain doesn't change after
     # other code has run.