Merge branch 'experimental/master'

3 files changed, 2 insertions, 38 deletions

diff --git a/test-suite/ideal-features/Apply.v b/test-suite/ideal-features/Apply.v
index db52af2f..7628b961 100644
--- a/test-suite/ideal-features/Apply.v
+++ b/test-suite/ideal-features/Apply.v
@@ -1,6 +1,6 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2012     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
diff --git a/test-suite/ideal-features/Case8.v b/test-suite/ideal-features/Case8.v
deleted file mode 100644
index 2ac5bd8c..00000000
--- a/test-suite/ideal-features/Case8.v
+++ /dev/null
@@ -1,36 +0,0 @@
-Inductive listn : nat -> Set :=
-  | niln : listn 0
-  | consn : forall n : nat, nat -> listn n -> listn (S n).
-
-Inductive empty : forall n : nat, listn n -> Prop :=
-    intro_empty : empty 0 niln.
-
-Parameter
-  inv_empty : forall (n a : nat) (l : listn n), ~ empty (S n) (consn n a l).
-
-Type
-  (fun (n : nat) (l : listn n) =>
-   match l in (listn n) return (empty n l \/ ~ empty n l) with
-   | niln => or_introl (~ empty 0 niln) intro_empty
-   | consn n O y as b => or_intror (empty (S n) b) (inv_empty n 0 y)
-   | consn n a y as b => or_intror (empty (S n) b) (inv_empty n a y)
-   end).
-
-
-Type
-  (fun (n : nat) (l : listn n) =>
-   match l in (listn n) return (empty n l \/ ~ empty n l) with
-   | niln => or_introl (~ empty 0 niln) intro_empty
-   | consn n O y => or_intror (empty (S n) (consn n 0 y)) (inv_empty n 0 y)
-   | consn n a y => or_intror (empty (S n) (consn n a y)) (inv_empty n a y)
-   end).
-
-
-
-Type
-  (fun (n : nat) (l : listn n) =>
-   match l in (listn n) return (empty n l \/ ~ empty n l) with
-   | niln => or_introl (~ empty 0 niln) intro_empty
-   | consn O a y as b => or_intror (empty 1 b) (inv_empty 0 a y)
-   | consn n a y as b => or_intror (empty (S n) b) (inv_empty n a y)
-   end).
diff --git a/test-suite/ideal-features/eapply_evar.v b/test-suite/ideal-features/eapply_evar.v
index 547860bf..bb61afb8 100644
--- a/test-suite/ideal-features/eapply_evar.v
+++ b/test-suite/ideal-features/eapply_evar.v
@@ -4,6 +4,6 @@
    and not "O = O" *)
 
 Lemma eapply_evar : O=O -> 0=O.
-intro H; eapply trans_equal;
+intro H; eapply eq_trans;
   [apply H | match goal with |- ?x = ?x => reflexivity end].
 Qed.