Merge pull request #301 from Nadrieril/rename-option

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

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

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;

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

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