Merge branch 'ralf/scopes' into 'master'

explicitly declare visibility of Scope actions

See merge request iris/iris!679

Makefile.coq.local

@@ -13,9 +13,10 @@ NORMALIZER:=test-normalizer.sed
 
 test: $(TESTFILES:.v=.vo)
 # Make sure everything imports the options, and all Instance/Argument/Hint are qualified.
+	$(SHOW)"Performing some style checks..."
 	$(HIDE)for FILE in $(VFILES); do \
 	  if ! fgrep -q 'From iris.prelude Require Import options.' "$$FILE"; then echo "ERROR: $$FILE does not import 'options'."; echo; exit 1; fi ; \
-	  if egrep '^\s*(Instance|Arguments|Remove|Hint (Extern|Constructors|Resolve|Immediate|Mode|Opaque|Transparent|Unfold))\s' "$$FILE"; then echo "ERROR: $$FILE contains unqualified 'Instance'/'Arguments'/'Hint' (see above)."; echo "Please add 'Global' or 'Local' as appropriate."; echo; exit 1; fi \
+	  if egrep '^\s*(Instance|Arguments|Remove|Hint\s+(Extern|Constructors|Resolve|Immediate|Mode|Opaque|Transparent|Unfold)|(Open|Close)\s+Scope)\s' "$$FILE"; then echo "ERROR: $$FILE contains unqualified 'Instance'/'Arguments'/'Hint'/'Scope' (see above)."; echo "Please add 'Global' or 'Local' as appropriate."; echo; exit 1; fi \
 	done
 # Make sure main Iris does not import other Iris packages.
 	$(HIDE)if egrep 'iris\.(heap_lang|deprecated|staging)' --include "*.v" -R iris; then echo "ERROR: Iris may not import modules from other Iris packages (see above for violations)."; echo; exit 1; fi

iris/proofmode/string_ident.v

@@ -77,8 +77,6 @@ Module StringToIdent.
                  intros $ident).
 End StringToIdent.
 
-Open Scope string_scope.
-
 (** Finally we wrap everything up intro a tactic that renames a variable given
 by ident [id] into the name given by string [s].
 Only works if [id] can be reverted, i.e. if nothing else depends on it. *)