From 09c02a7b56575e826c66a6c8873b290a8afb5827 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Tue, 25 Jun 2024 13:57:52 +0200 Subject: Update charon --- charon-pin | 2 +- compiler/RegionsHierarchy.ml | 4 +--- flake.lock | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/charon-pin b/charon-pin index 2621304e..345f441e 100644 --- a/charon-pin +++ b/charon-pin @@ -1,2 +1,2 @@ # This is the commit from https://github.com/AeneasVerif/charon that should be used with this version of aeneas. -5c2ae3744ce702d07920d0f536a272aadd396ed9 +ae55966c01a1a4b185a1a34da7861ba5db74c8ad diff --git a/compiler/RegionsHierarchy.ml b/compiler/RegionsHierarchy.ml index 6c5253b8..61fa37d9 100644 --- a/compiler/RegionsHierarchy.ml +++ b/compiler/RegionsHierarchy.ml @@ -148,9 +148,7 @@ let compute_regions_hierarchy_for_sig (span : Meta.span option) let subst = Subst.make_subst_from_generics decl.generics generics tr_self in - let predicates = - Subst.generic_params_substitute subst decl.generics - in + let predicates = Subst.predicates_substitute subst decl.generics in (* Note that because we also explore the generics below, we may explore several times the same type - this is ok *) List.iter diff --git a/flake.lock b/flake.lock index 73bd300d..08b53bad 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1719229989, - "narHash": "sha256-/Eb1xd65HQeZtO7R/XMXA0ibzig7mffOLNGITuG6rVQ=", + "lastModified": 1719316648, + "narHash": "sha256-OUlAPxAyNruZZ7b7MxRdi4udvTOwUQW2kn6rg9Xn7fk=", "owner": "aeneasverif", "repo": "charon", - "rev": "5c2ae3744ce702d07920d0f536a272aadd396ed9", + "rev": "ae55966c01a1a4b185a1a34da7861ba5db74c8ad", "type": "github" }, "original": { -- cgit v1.2.3