diff options
| author | Matthieu Sozeau | 2018-11-07 19:53:51 +0100 |
|---|---|---|
| committer | Matthieu Sozeau | 2018-11-07 19:53:51 +0100 |
| commit | 65927c22bcad62e1bc9a28a57377d82eba215a2d (patch) | |
| tree | f3f4d9dc5383ac36a6a1cb5838e56711c8b585d4 | |
| parent | 9185c2ed45319c2b35da0e7af9d8a9126f8035ed (diff) | |
| parent | e2e45e45a09ab25bf33ba49eef5a7cba9a30b337 (diff) | |
Merge PR #8934: Revert "Do not allow spliting in res_pf, this is reserved for pretyping"
| -rw-r--r-- | proofs/clenvtac.ml | 2 | ||||
| -rw-r--r-- | test-suite/success/Hints.v | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/proofs/clenvtac.ml b/proofs/clenvtac.ml index 77f5804665..b99cf245fe 100644 --- a/proofs/clenvtac.ml +++ b/proofs/clenvtac.ml @@ -72,7 +72,7 @@ let clenv_refine ?(with_evars=false) ?(with_classes=true) clenv = if with_classes then let evd' = Typeclasses.resolve_typeclasses ~filter:Typeclasses.all_evars - ~fail:(not with_evars) ~split:false clenv.env clenv.evd + ~fail:(not with_evars) clenv.env clenv.evd in Typeclasses.make_unresolvables (fun x -> List.mem_f Evar.equal x evars) evd' else clenv.evd diff --git a/test-suite/success/Hints.v b/test-suite/success/Hints.v index ebf5b094e1..2f13b7c225 100644 --- a/test-suite/success/Hints.v +++ b/test-suite/success/Hints.v @@ -169,7 +169,7 @@ Proof. Hint Cut [_* (a_is_b | b_is_c | c_is_d | d_is_e) (a_compose | b_compose | c_compose | d_compose | e_compose)] : typeclass_instances. -Timeout 1 Fail apply _. (* 0.06s *) + Timeout 1 Fail apply _. (* 0.06s *) Abort. End HintCut. |