From bfa2ff646c5830de1662576658f4ae69e207ffca Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Thu, 21 Jul 2022 12:24:13 +0000 Subject: [PATCH] Use a MIRI namespaced env var name for auto ops --- CONTRIBUTING.md | 4 ++-- miri | 4 ++-- 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.