From e7a7f588f504202afba0ddc29f19610896c737cc Mon Sep 17 00:00:00 2001
From: Ralf Jung <jung@mpi-sws.org>
Date: Tue, 19 Jan 2021 10:15:39 +0100
Subject: [PATCH] fix and reject warnings on Coq 8.13
---
.gitlab-ci.yml | 1 +
Makefile.coq.local | 2 +-
theories/list.v | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76cc51eb..d974e662 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,6 +38,7 @@ build-coq.8.13.0:
<<: *template
variables:
OPAM_PINS: "coq version 8.13.0"
+ DENY_WARNINGS: "1"
build-coq.8.12.2:
<<: *template
diff --git a/Makefile.coq.local b/Makefile.coq.local
index 95db31bf..9dc1159e 100644
--- a/Makefile.coq.local
+++ b/Makefile.coq.local
@@ -15,7 +15,7 @@ test: $(TESTFILES:.v=.vo)
# Make sure everything imports the options, and all Instance/Argument/Hint are qualified.
$(HIDE)for FILE in $(VFILES); do \
if ! fgrep -q 'From stdpp Require Import options.' "$$FILE"; then echo "ERROR: $$FILE does not import 'options'."; echo; exit 1; fi ; \
- if egrep '^\s*(Instance|Arguments|Hint (Extern|Constructors|Resolve|Immediate|Mode|Opaque|Transparent|Unfold))\s' "$$FILE"; then echo "ERROR: $$FILE contains unqualified 'Instance'/'Arguments'/'Hint'."; 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'."; echo; exit 1; fi \
done
.PHONY: test
diff --git a/theories/list.v b/theories/list.v
index 71b761b1..10ce38ff 100644
--- a/theories/list.v
+++ b/theories/list.v
@@ -31,7 +31,7 @@ Instance: Params (@drop) 1 := {}.
Global Arguments Permutation {_} _ _ : assert.
Global Arguments Forall_cons {_} _ _ _ _ _ : assert.
-Remove Hints Permutation_cons : typeclass_instances.
+Global Remove Hints Permutation_cons : typeclass_instances.
Notation "(::)" := cons (only parsing) : list_scope.
Notation "( x ::.)" := (cons x) (only parsing) : list_scope.
--
GitLab