Skip to content

Commit c22543b

Browse files
authored
Merge pull request #14 from cryspen/bump-aeneas
feat: update to latest cryspen/aeneas
2 parents 18b49c8 + 727ec3d commit c22543b

8 files changed

Lines changed: 592 additions & 605 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99
# All version pins live here.
1010
env:
1111
RUST_TOOLCHAIN: nightly-2026-02-07
12-
CHARON_REV: 1ec8d4bb0116abf4486bac234ac01acf84e2a83a
13-
AENEAS_REV: 2c0bf87600a4bdcd65e41e9c4eb4066200a48308
12+
CHARON_REV: a535e914f74db4fd9e6be7048f4233270d8945c0
13+
AENEAS_REV: 8d2077ce4946b52d2d199fe9d2f2d520a4bf8184
1414
# Where the cache step stages the charon / aeneas binaries.
1515
AENEAS_DIR: ${{ github.workspace }}/.tools/aeneas
1616

lean/CoreModels/Alloc/Funs.lean

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ set_option maxRecDepth 2048
2323

2424
namespace CoreModels.alloc
2525

26-
/-- [alloc::borrow::{alloc::borrow::ToOwned for T}::to_owned]:
26+
/-- [alloc::borrow::{impl alloc::borrow::ToOwned for T}::to_owned]:
2727
Source: 'src/lib.rs', lines 23:8-25:9
2828
Visibility: public -/
2929
def borrow.ToOwned.Blanket.to_owned {T : Type} (self : T) : Result T := do
3030
ok self
3131

32-
/-- Trait implementation: [alloc::borrow::{alloc::borrow::ToOwned for T}]
32+
/-- Trait implementation: [alloc::borrow::{impl alloc::borrow::ToOwned for T}]
3333
Source: 'src/lib.rs', lines 22:4-26:5 -/
3434
@[reducible]
3535
def borrow.ToOwned.Blanket (T : Type) : borrow.ToOwned T := {
@@ -78,7 +78,7 @@ def collections.vec_deque.VecDeque.pop_front
7878
let (t, s1) ← rust_primitives.sequence.seq_remove s 0#usize
7979
ok (core.option.Option.Some t, (s1, pd))
8080

81-
/-- [alloc::collections::vec_deque::{core::ops::index::Index<usize, T> for alloc::collections::vec_deque::VecDeque<T, A>}::index]:
81+
/-- [alloc::collections::vec_deque::{impl core::ops::index::Index<usize, T> for alloc::collections::vec_deque::VecDeque<T, A>}::index]:
8282
Source: 'src/lib.rs', lines 215:12-217:13
8383
Visibility: public -/
8484
def collections.vec_deque.VecDeque.Insts.CoreOpsIndexIndexUsizeT.index
@@ -89,7 +89,7 @@ def collections.vec_deque.VecDeque.Insts.CoreOpsIndexIndexUsizeT.index
8989
let (s, _) := self
9090
rust_primitives.sequence.seq_index s i
9191

92-
/-- Trait implementation: [alloc::collections::vec_deque::{core::ops::index::Index<usize, T> for alloc::collections::vec_deque::VecDeque<T, A>}]
92+
/-- Trait implementation: [alloc::collections::vec_deque::{impl core::ops::index::Index<usize, T> for alloc::collections::vec_deque::VecDeque<T, A>}]
9393
Source: 'src/lib.rs', lines 212:8-218:9 -/
9494
@[reducible]
9595
def collections.vec_deque.VecDeque.Insts.CoreOpsIndexIndexUsizeT (T : Type) (A
@@ -147,14 +147,16 @@ def vec.VecTGlobal.with_capacity
147147
/-- [alloc::vec::{alloc::vec::Vec<T, A>}::len]:
148148
Source: 'src/lib.rs', lines 371:8-373:9
149149
Visibility: public -/
150-
def vec.Vec.len {T : Type} (A : Type) (self : vec.Vec T A) : Result Std.Usize := do
150+
def vec.Vec.len
151+
{T : Type} {A : Type} (self : vec.Vec T A) : Result Std.Usize := do
151152
let (s, _) := self
152153
rust_primitives.sequence.seq_len s
153154

154155
/-- [alloc::vec::{alloc::vec::Vec<T, A>}::push]:
155156
Source: 'src/lib.rs', lines 375:8-377:9
156157
Visibility: public -/
157-
def vec.Vec.push {T : Type} (A : Type) (self : vec.Vec T A) (x : T) :
158+
def vec.Vec.push
159+
{T : Type} {A : Type} (self : vec.Vec T A) (x : T) :
158160
Result (vec.Vec T A)
159161
:= do
160162
let (s, pd) := self
@@ -189,7 +191,8 @@ def vec.Vec.is_empty
189191
/-- [alloc::vec::{alloc::vec::Vec<T, A>}::insert]:
190192
Source: 'src/lib.rs', lines 391:8-396:9
191193
Visibility: public -/
192-
def vec.Vec.insert {T : Type} (A : Type) (self : vec.Vec T A) (index : Std.Usize) (element : T)
194+
def vec.Vec.insert
195+
{T : Type} {A : Type} (self : vec.Vec T A) (index : Std.Usize) (element : T)
193196
:
194197
Result (vec.Vec T A)
195198
:= do
@@ -281,7 +284,7 @@ def vec.Vec.drain
281284
let (s1, s2) ← rust_primitives.sequence.seq_drain s 0#usize l
282285
ok ((s1, core.marker.PhantomData.mk), (s2, pd))
283286

284-
/-- [alloc::vec::drain::{core::iter::traits::iterator::Iterator<T> for alloc::vec::drain::Drain<T, A>}::next]:
287+
/-- [alloc::vec::drain::{impl core::iter::traits::iterator::Iterator<T> for alloc::vec::drain::Drain<T, A>}::next]:
285288
Source: 'src/lib.rs', lines 431:12-438:13
286289
Visibility: public -/
287290
def vec.drain.Drain.Insts.CoreIterTraitsIteratorIterator.next
@@ -296,7 +299,7 @@ def vec.drain.Drain.Insts.CoreIterTraitsIteratorIterator.next
296299
let (res, s1) ← rust_primitives.sequence.seq_remove s 0#usize
297300
ok (core.option.Option.Some res, (s1, pd))
298301

299-
/-- Trait implementation: [alloc::vec::drain::{core::iter::traits::iterator::Iterator<T> for alloc::vec::drain::Drain<T, A>}]
302+
/-- Trait implementation: [alloc::vec::drain::{impl core::iter::traits::iterator::Iterator<T> for alloc::vec::drain::Drain<T, A>}]
300303
Source: 'src/lib.rs', lines 429:8-439:9 -/
301304
@[reducible]
302305
def vec.drain.Drain.Insts.CoreIterTraitsIteratorIterator (T : Type) (A : Type)
@@ -306,22 +309,23 @@ def vec.drain.Drain.Insts.CoreIterTraitsIteratorIterator (T : Type) (A : Type)
306309

307310
/-- [alloc::vec::{alloc::vec::Vec<T, A>}::extend_from_slice]:
308311
Source: 'src/lib.rs', lines 445:8-447:9 -/
309-
def vec.Vec.extend_from_slice {T : Type} (A : Type) (corecloneCloneInst : core.clone.Clone T)
312+
def vec.Vec.extend_from_slice
313+
{T : Type} {A : Type} (corecloneCloneInst : core.clone.Clone T)
310314
(self : vec.Vec T A) (other : Slice T) :
311315
Result (vec.Vec T A)
312316
:= do
313317
let (s, pd) := self
314318
let s1 ← rust_primitives.sequence.seq_extend corecloneCloneInst s other
315319
ok (s1, pd)
316320

317-
/-- [alloc::vec::{core::ops::deref::Deref<[T]> for alloc::vec::Vec<T, A>}::deref]:
321+
/-- [alloc::vec::{impl core::ops::deref::Deref<[T]> for alloc::vec::Vec<T, A>}::deref]:
318322
Source: 'src/lib.rs', lines 478:8-480:9
319323
Visibility: public -/
320324
def vec.Vec.Insts.CoreOpsDerefDerefSlice.deref
321325
{T : Type} {A : Type} (self : vec.Vec T A) : Result (Slice T) := do
322326
vec.Vec.as_slice self
323327

324-
/-- Trait implementation: [alloc::vec::{core::ops::deref::Deref<[T]> for alloc::vec::Vec<T, A>}]
328+
/-- Trait implementation: [alloc::vec::{impl core::ops::deref::Deref<[T]> for alloc::vec::Vec<T, A>}]
325329
Source: 'src/lib.rs', lines 475:4-481:5 -/
326330
@[reducible]
327331
def vec.Vec.Insts.CoreOpsDerefDerefSlice (T : Type) (A : Type) :

0 commit comments

Comments
 (0)