aboutsummaryrefslogtreecommitdiff
path: root/theories
diff options
context:
space:
mode:
authormsozeau2008-09-13 19:01:08 +0000
committermsozeau2008-09-13 19:01:08 +0000
commit047037ecc6494efa77bde400bdf5e77b16daa5e0 (patch)
tree2d91e23c9e35f375ed9b81d2f9b4de6416ac16ad /theories
parentcdb783158991ab7139e55f8a2e85d409e1ac8493 (diff)
Remove redefinition of id in Program.Basics, just add maximal implicits.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11401 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'theories')
-rw-r--r--theories/Classes/SetoidClass.v2
-rw-r--r--theories/Program/Basics.v4
2 files changed, 3 insertions, 3 deletions
diff --git a/theories/Classes/SetoidClass.v b/theories/Classes/SetoidClass.v
index adeb38d490..f2ce4fe126 100644
--- a/theories/Classes/SetoidClass.v
+++ b/theories/Classes/SetoidClass.v
@@ -148,7 +148,7 @@ Ltac obligation_tactic ::= morphism_tac.
using [iff_impl_id_morphism] if the proof is in [Prop] and
[eq_arrow_id_morphism] if it is in Type. *)
-Program Instance iff_impl_id_morphism : Morphism (iff ++> impl) Basics.id.
+Program Instance iff_impl_id_morphism : Morphism (iff ++> impl) id.
(* Program Instance eq_arrow_id_morphism : ? Morphism (eq +++> arrow) id. *)
diff --git a/theories/Program/Basics.v b/theories/Program/Basics.v
index 6a61a16d45..d304b651f2 100644
--- a/theories/Program/Basics.v
+++ b/theories/Program/Basics.v
@@ -15,9 +15,9 @@
(* $Id$ *)
-(** The polymorphic identity function. *)
+(** The polymorphic identity function is defined in [Datatypes]. *)
-Definition id {A} := fun x : A => x.
+Implicit Arguments id [[A]].
(** Function composition. *)