Merge PR #12759: [vernac] refine check for unresolved evars

Reviewed-by: SkySkimmer
Ack-by: gares

2 files changed, 22 insertions, 6 deletions

diff --git a/test-suite/output/RecordMissingField.out b/test-suite/output/RecordMissingField.out
index 7c80a6065f..28beee90b2 100644
--- a/test-suite/output/RecordMissingField.out
+++ b/test-suite/output/RecordMissingField.out
@@ -1,4 +1,16 @@
-File "stdin", line 8, characters 5-22:
-Error: Cannot infer field y2p of record point2d in environment:
-p : point2d
-
+The command has indeed failed with message:
+The following term contains unresolved implicit arguments:
+  (fun p : point2d => {| x2p := x2p p + 1; y2p := ?y2p |})
+More precisely: 
+- ?y2p: Cannot infer field y2p of record point2d in environment:
+  p : point2d
+The command has indeed failed with message:
+The following term contains unresolved implicit arguments:
+  (fun p : point2d => {| x2p := x2p p + (fun n : nat => ?n) 1; y2p := ?y2p |})
+More precisely: 
+- ?n: Cannot infer this placeholder of type "nat" in
+  environment:
+  p : point2d
+  n : nat
+- ?y2p: Cannot infer field y2p of record point2d in environment:
+  p : point2d
diff --git a/test-suite/output/RecordMissingField.v b/test-suite/output/RecordMissingField.v
index 84f1748fa0..8ca721564b 100644
--- a/test-suite/output/RecordMissingField.v
+++ b/test-suite/output/RecordMissingField.v
@@ -3,6 +3,10 @@ should contain missing field, and the inferred type of the record **)
 
 Record point2d := mkPoint { x2p: nat; y2p: nat }.
 
-
-Definition increment_x (p: point2d) : point2d :=
+Fail Definition increment_x (p: point2d) : point2d :=
   {| x2p := x2p p + 1; |}.
+
+(* Here there is also an unresolved implicit, which should give an
+   understadable error as well *)
+Fail Definition increment_x (p: point2d) : point2d :=
+  {| x2p := x2p p + (fun n => _) 1; |}.