diff --git a/charon-pin b/charon-pin index eebe608f9..9b45db5fb 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. -962f26311ccdf09a6a3cfeacbccafba22bf3d405 +34014046de827679e27967de482a33c02e0a865a diff --git a/flake.lock b/flake.lock index 16e8ee5fc..7df424ed6 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1723705977, - "narHash": "sha256-pfxZB7R4kyHr/+8/UYpvKBlTBlDY1H0oTIwqQI0vAXA=", + "lastModified": 1724231050, + "narHash": "sha256-RGKXT/OrFTnOU2fwO2yHvr5+ylGlKcRksyFw2viYIgw=", "owner": "aeneasverif", "repo": "charon", - "rev": "962f26311ccdf09a6a3cfeacbccafba22bf3d405", + "rev": "34014046de827679e27967de482a33c02e0a865a", "type": "github" }, "original": { @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1723688259, - "narHash": "sha256-WzeUR1MG9MnJnh9T7qcVe/v12qHvJvzdc3Z5HCeE2ns=", + "lastModified": 1724206841, + "narHash": "sha256-L8dKaX4T3k+TR2fEHCfGbH4UXdspovz/pj87iai9qmc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6e75319846684326d900daff1e2e11338cc80d2b", + "rev": "45e98fbd62c32e5927e952d2833fa1ba4fb35a61", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dcd0a7fbd..7fdc5c65c 100644 --- a/flake.nix +++ b/flake.nix @@ -90,7 +90,7 @@ betree-llbc = charon.extractCrateWithCharon.${system} { name = "betree"; src = ./tests/src/betree; - charonFlags = "--polonius --opaque=betree_utils"; + charonFlags = "--polonius --opaque=crate::betree_utils"; craneExtraArgs.checkPhaseCargoCommand = '' cargo rustc -- --test -Zpolonius ./target/debug/betree diff --git a/tests/README.md b/tests/README.md index c9ca00475..b89bc7782 100644 --- a/tests/README.md +++ b/tests/README.md @@ -45,7 +45,7 @@ The test runner supports setting several options for each test. - For crates, it will read the `crate_dir/aeneas-test-options` file. In both cases it supports the same options. Typical options are: -- `charon-args=--polonius --opaque=betree_utils`: pass these arguments to `charon`; +- `charon-args=--polonius --opaque=crate::betree_utils`: pass these arguments to `charon`; - `aeneas-args=-test-trans-units`: pass these arguments to `aeneas` for all backends; - `[fstar] aeneas-args=-decreases-clauses -template-clauses`: pass these arguments to `aeneas` for the `fstar` backend; diff --git a/tests/src/betree/aeneas-test-options b/tests/src/betree/aeneas-test-options index c59ada7ab..fdd045710 100644 --- a/tests/src/betree/aeneas-test-options +++ b/tests/src/betree/aeneas-test-options @@ -1,4 +1,4 @@ -charon-args=--polonius --opaque=betree_utils +charon-args=--polonius --opaque=crate::betree_utils [!borrow-check] aeneas-args=-backward-no-state-update -test-trans-units -state -split-files [coq] aeneas-args=-use-fuel [fstar] aeneas-args=-decreases-clauses diff --git a/tests/src/hashmap.rs b/tests/src/hashmap.rs index 6d7702c1c..891969ebc 100644 --- a/tests/src/hashmap.rs +++ b/tests/src/hashmap.rs @@ -1,4 +1,4 @@ -//@ charon-args=--opaque=utils +//@ charon-args=--opaque=crate::utils //@ [!borrow-check] aeneas-args=-state -split-files //@ [coq] aeneas-args=-use-fuel //@ [fstar] aeneas-args=-decreases-clauses