Skip to content

Commit e135972

Browse files
authored
Update charon submodule by 15 commits (model-checking#4464)
This increment advances the charon submodule from 0c4617c9 to 30cab882 (15 commits). API Changes Required: - TraitDecl.const_defaults: HashMap → IndexMap - TraitDecl.type_defaults: HashMap → IndexMap Progress: 15 of ~1008 commits (1.5%) By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.
1 parent 76a4adc commit e135972

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
lines changed

Cargo.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
248248

249249
[[package]]
250250
name = "charon"
251-
version = "0.1.65"
251+
version = "0.1.67"
252252
dependencies = [
253253
"annotate-snippets",
254254
"anstream",
@@ -940,6 +940,7 @@ dependencies = [
940940
"charon",
941941
"clap",
942942
"cprover_bindings",
943+
"indexmap",
943944
"itertools 0.14.0",
944945
"kani_metadata",
945946
"lazy_static",

charon

Submodule charon updated 51 files

kani-compiler/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ publish = false
1212
cbmc = { path = "../cprover_bindings", package = "cprover_bindings", optional = true }
1313
charon = { path = "../charon/charon", optional = true, default-features = false }
1414
clap = { version = "4.4.11", features = ["derive", "cargo"] }
15+
indexmap = { version = "2.7.1", features = ["serde"] }
1516
itertools = "0.14"
1617
kani_metadata = { path = "../kani_metadata" }
1718
lazy_static = "1.5.0"

kani-compiler/src/codegen_aeneas_llbc/compiler_interface.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ use rustc_session::Session;
4040
use rustc_session::config::{CrateType, OutputFilenames, OutputType};
4141
use rustc_session::output::out_filename;
4242
use std::any::Any;
43-
use std::cell::RefCell;
4443
use std::fs::File;
4544
use std::path::Path;
4645
use std::sync::{Arc, Mutex};

kani-compiler/src/codegen_aeneas_llbc/mir_to_ullbc/mod.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ use charon_lib::ullbc_ast::{
5454
};
5555
use charon_lib::{error_assert, raise_error, register_error};
5656
use core::panic;
57+
use indexmap::IndexMap;
5758
use rustc_data_structures::fx::FxHashMap;
5859
use rustc_middle::ty::{TyCtxt, TypingEnv};
5960
use rustc_public::mir::mono::{Instance, InstanceDef};
@@ -118,21 +119,17 @@ impl<'a, 'tcx> Context<'a, 'tcx> {
118119
self.errors.span_err(self.translated, span, msg)
119120
}
120121

121-
fn continue_on_failure(&self) -> bool {
122-
self.errors.continue_on_failure()
123-
}
124-
125122
fn translate_traitdecl(&mut self, trait_def: TraitDef) -> CharonTraitDeclId {
126123
let trait_def_id = trait_def.def_id();
127124
let trait_decl_id = self.register_trait_decl_id(trait_def_id);
128125
match self.translated.trait_decls.get(trait_decl_id) {
129126
None => {
130127
let trait_decl = TraitDef::declaration(&trait_def);
131128
let consts = Vec::new();
132-
let const_defaults = HashMap::new();
129+
let const_defaults = IndexMap::new();
133130
let types = Vec::new();
134131
let type_clauses = Vec::new();
135-
let type_defaults = HashMap::new();
132+
let type_defaults = IndexMap::new();
136133
let required_methods = Vec::new();
137134
let provided_methods = Vec::new();
138135
let parent_clauses = CharonVector::new();

scripts/charon-patch.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ index 20f8a9df..a1bf1ee6 100644
44
+++ b/charon/Cargo.toml
55
@@ -2,7 +2,7 @@
66
name = "charon"
7-
version = "0.1.65"
7+
version = "0.1.67"
88
authors = ["Son Ho <[email protected]>"]
99
-edition = "2021"
1010
+edition = "2024"

0 commit comments

Comments
 (0)