Skip to content

Update Charon submodule to v0.1.69 #4660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tautschnig wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Charon submodule to v0.1.69 #4660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"

[[package]]
name = "charon"
version = "0.1.68"
version = "0.1.69"
dependencies = [
"annotate-snippets",
"anstream 0.6.21",
Expand Down
2 changes: 1 addition & 1 deletion charon
Open in desktop
Submodule charon updated 155 files
2 changes: 1 addition & 1 deletion kani-compiler/src/codegen_aeneas_llbc/mir_to_ullbc/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1873,7 +1873,7 @@ impl<'a, 'tcx> Context<'a, 'tcx> {
}
}
CharonTyKind::Adt(CharonTypeId::Tuple, genargs) => {
let c_fprj = CharonFieldProjKind::Tuple(genargs.types.len());
let c_fprj = CharonFieldProjKind::Tuple(genargs.types.elem_count());
current_ty = self.translate_ty(*ty);
c_provec.push((
CharonProjectionElem::Field(c_fprj, c_fieldid),
Expand Down
10 changes: 5 additions & 5 deletions scripts/charon-patch.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
diff --git a/charon/Cargo.toml b/charon/Cargo.toml
index d76c223c..0b354b1c 100644
index cbba6280f..8b5b4ece8 100644
--- a/charon/Cargo.toml
+++ b/charon/Cargo.toml
@@ -2,7 +2,7 @@
name = "charon"
version = "0.1.68"
version = "0.1.69"
authors = ["Son Ho <hosonmarc@gmail.com>"]
-edition = "2021"
+edition = "2024"
license = "Apache-2.0"

[lib]
diff --git a/charon/src/ids/vector.rs b/charon/src/ids/vector.rs
index 141cabe3..37948679 100644
index 24dd10839..3ef70b0bc 100644
--- a/charon/src/ids/vector.rs
+++ b/charon/src/ids/vector.rs
@@ -254,7 +254,7 @@ where
@@ -260,7 +260,7 @@ where
self.iter_indexed().map(|(id, _)| id)
}

Expand All @@ -25,7 +25,7 @@ index 141cabe3..37948679 100644
}

diff --git a/charon/src/transform/expand_associated_types.rs b/charon/src/transform/expand_associated_types.rs
index 225da182..54370990 100644
index 2b8a5d162..4716da208 100644
--- a/charon/src/transform/expand_associated_types.rs
+++ b/charon/src/transform/expand_associated_types.rs
@@ -761,7 +761,7 @@ impl<'a> ComputeItemModifications<'a> {
Expand Down
Loading