Rename new lemma, compress proofs of new lemmas

Rename cardinal_3 -> cardinal_Add_In

Compress and structure proofs for both cardinal_Add_In and
Add_transpose_neqkey using feedback from the PR (coq#12096).
This includes
  * using commas to simplify multiple lines of rewrites, especially when
    using add_eq_o and add_neq_o repeatedly.
  * using `now` and `auto` more to solve trivial goals instead of ending
    proofs with trivial `reflexivity` or `assumption`.
  * split subgoals into bulleted points where relevant, as well as
    indent subgoals for enough/assert.

theories/FSets/FMapFacts.v

@@ -758,34 +758,19 @@ Module WProperties_fun (E:DecidableType)(M:WSfun E).
   intros.
   exists (add k2 e2 m1).
   split.
+
   easy.
+
   unfold Add; intros.
-  rewrite -> H1.
+  rewrite H1.
   destruct (E.eq_dec k1 y).
-
-  assert (~ E.eq k2 y).
-  contradict H.
-  apply E.eq_trans with (y:=y).
-  assumption. apply E.eq_sym. assumption.
-  rewrite add_neq_o by assumption.
-  rewrite add_eq_o by assumption.
-  rewrite -> H0.
-  rewrite add_eq_o by assumption.
-  reflexivity.
-
-  destruct (E.eq_dec k2 y).
-
-  rewrite add_eq_o by assumption.
-  rewrite add_neq_o by assumption.
-  rewrite add_eq_o by assumption.
-  reflexivity.
-
-  rewrite add_neq_o by assumption.
-  rewrite H0.
-  rewrite add_neq_o by assumption.
-  rewrite add_neq_o by assumption.
-  rewrite add_neq_o by assumption.
-  reflexivity.
+  - assert (~ E.eq k2 y).
+     contradict H.
+     apply E.eq_trans with (y:=y); auto.
+    now rewrite add_neq_o, add_eq_o, H0, add_eq_o by assumption.
+  - destruct (E.eq_dec k2 y).
+    + now rewrite add_eq_o, add_neq_o, add_eq_o by assumption.
+    + now rewrite add_neq_o, H0, add_neq_o, add_neq_o, add_neq_o by assumption.
   Qed.
 
   Notation eqke := (@eq_key_elt elt).
@@ -1264,81 +1249,64 @@ Module WProperties_fun (E:DecidableType)(M:WSfun E).
   apply fold_Add with (eqA:=eq); compute; auto.
   Qed.
 
-  Lemma cardinal_3 :
+  Lemma cardinal_Add_In:
     forall m m' x e, In x m -> Add x e m m' -> cardinal m' = cardinal m.
   Proof.
   intros m.
   induction m using map_induction.
-
-  intros.
-  contradict H0. intros [ e' He' ]. apply H in He'. auto.
-
-  intros.
-  destruct  (E.eq_dec x x0).
-
-  enough (Add x0 e0 m1 m').
-  rewrite cardinal_2 with (m:=m1) (m':=m2) (x:=x) (e:=e).
-  rewrite cardinal_2 with (m:=m1) (m':=m') (x:=x0) (e:=e0).
-  reflexivity.
-  contradict H.
-  apply (In_iff m1 e1).
-  assumption.
-  assumption.
-  assumption.
-  assumption.
-
-  intro y.
-  destruct (E.eq_dec x0 y).
-  rewrite H2.
-  do 2 rewrite add_eq_o by assumption.
-  reflexivity.
-
-  rewrite H2.
-  do 2 rewrite add_neq_o by assumption.
-  rewrite H0.
-  assert (~E.eq x y).
-  contradict n.
-  apply E.eq_trans with (y:= x). apply E.eq_sym. assumption. assumption.
-  rewrite add_neq_o by assumption.
-  reflexivity.
-
-  destruct (Add_transpose_neqkey) with (k1:=x) (k2:=x0) (e1:=e) (e2:=e0) (m1:=m1) (m2:=m2) (m3:=m') as [ transposed [ Add_transposed_1 Add_transposed_2 ] ].
-  assumption.
-  assumption.
-  assumption.
-
-  rewrite cardinal_2 with (x:=x) (e:=e) (m:=transposed).
-  rewrite cardinal_2 with (x:=x) (e:=e) (m:=m1) (m':=m2).
-  rewrite IHm1 with (x:=x0) (e:=e0).
-  reflexivity.
-
-  destruct H1 as [ e' e'mapsto ].
-  exists e'.
-  apply M.add_3 with (x:=x) (e':=e).
-  assumption.
-  apply find_mapsto_iff.
-  rewrite <- H0.
-  apply find_mapsto_iff.
-  assumption.
-
-  assumption.
-  assumption.
-  assumption.
-
-  contradict n.
-  assert (In x (add x0 e0 m1)).
-  destruct n as [ e' e'mapsto ].
-  exists e'.
-  apply find_mapsto_iff.
-  rewrite <- Add_transposed_1.
-  apply find_mapsto_iff.
-  assumption.
-  apply add_in_iff in H3.
-  destruct H3.
-  apply E.eq_sym; assumption.
-  contradiction.
-
-  assumption.
+  - intros.
+    contradict H0.
+    intros [ e' He' ].
+    now apply H in He'.
+
+  - intros.
+    destruct  (E.eq_dec x x0).
+    + enough (Add x0 e0 m1 m').
+       rewrite cardinal_2 with (m:=m1) (m':=m2) (x:=x) (e:=e) by assumption.
+       rewrite cardinal_2 with (m:=m1) (m':=m') (x:=x0) (e:=e0); try assumption.
+       reflexivity.
+       contradict H.
+       now apply (In_iff m1 e1).
+
+      intro y.
+      destruct (E.eq_dec x0 y).
+      * rewrite H2.
+        now do 2 rewrite add_eq_o by assumption.
+      * rewrite H2.
+        do 2 rewrite add_neq_o by assumption.
+        rewrite H0.
+        assert (~E.eq x y).
+         contradict n.
+         now apply E.eq_trans with (y:= x).
+        now rewrite add_neq_o by assumption.
+
+    + destruct (Add_transpose_neqkey) with (k1:=x) (k2:=x0) (e1:=e) (e2:=e0) (m1:=m1) (m2:=m2) (m3:=m')
+        as [ transposed [ Add_transposed_1 Add_transposed_2 ] ]; auto.
+      rewrite cardinal_2 with (x:=x) (e:=e) (m:=transposed); try assumption.
+      rewrite cardinal_2 with (x:=x) (e:=e) (m:=m1) (m':=m2) by assumption.
+      rewrite IHm1 with (x:=x0) (e:=e0).
+      reflexivity.
+
+      destruct H1 as [ e' e'mapsto ].
+      exists e'.
+      apply M.add_3 with (x:=x) (e':=e).
+      assumption.
+
+      apply find_mapsto_iff.
+      rewrite <- H0 by assumption.
+      now apply find_mapsto_iff.
+      assumption.
+
+      contradict n.
+      assert (In x (add x0 e0 m1)).
+       destruct n as [ e' e'mapsto ].
+       exists e'.
+       apply find_mapsto_iff.
+       rewrite <- Add_transposed_1.
+       apply find_mapsto_iff.
+       assumption.
+      apply add_in_iff in H3.
+      now destruct H3.
   Qed.
 
   Lemma cardinal_inv_1 : forall m : t elt,