Skip to content

Commit ec31816

Browse files
authored
Merge pull request #24 from os-checker/sync
Sync: nightly-2025-04-07 from kani
2 parents f3e57d0 + d5e51bb commit ec31816

File tree

8 files changed

+478
-541
lines changed

8 files changed

+478
-541
lines changed

.github/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ <h2>Distributed Verification API docs</h2>
5353
<a href="./distributed_verification/">distributed_verification APIs</a>
5454
</li>
5555
<li>
56-
<a href="./rustc/">Rustc Internal APIs</a> (nightly-xxxx-xx-xx) required by Charon
56+
<a href="./rustc/">Rustc Internal APIs</a> (nightly-xxxx-xx-xx) required by Kani
5757
</li>
5858
</ul>
5959
</body>

kani

Submodule kani updated 96 files

src/functions/mod.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ pub fn analyze(tcx: TyCtxt, src_map: &SourceMap) -> Vec<SerFunction> {
3131
let (mono_items, callgraph) = collect_reachable_items(tcx, &entries);
3232

3333
// Filter out non kanitool functions.
34-
mono_items
34+
let mut proofs: Vec<_> = mono_items
3535
.iter()
36-
.filter_map(|item| Function::new(item, &callgraph, tcx, src_map, |x| !x.attrs.is_empty()))
37-
.map(|fun| SerFunction::new(fun, tcx, src_map))
38-
.collect()
36+
.filter_map(|f| Function::new(f, &callgraph, tcx, src_map, |x| !x.attrs.is_empty()))
37+
.collect();
38+
// Sort proofs by file path and source code.
39+
proofs.sort_by(|a, b| (&*a.file, &*a.func).cmp(&(&*b.file, &*b.func)));
40+
proofs.into_iter().map(|fun| SerFunction::new(fun, tcx, src_map)).collect()
3941
}
4042

4143
/// A Rust funtion with its file source, attributes, and raw function content.

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub struct SerFunction {
1414
pub attrs: Vec<String>,
1515
/// Raw function string, including name, signature, and body.
1616
pub func: String,
17-
/// Recursive fnction calls inside the body.
17+
/// Recursive function calls inside the body.
1818
pub callees: Vec<Callee>,
1919
}
2020

tests/snapshots/contract1.json

Lines changed: 73 additions & 88 deletions
Large diffs are not rendered by default.

tests/snapshots/contract2.json

Lines changed: 161 additions & 176 deletions
Large diffs are not rendered by default.

tests/snapshots/standard_proofs.json

Lines changed: 79 additions & 84 deletions
Large diffs are not rendered by default.

tests/snapshots/standard_proofs_with_contracts.json

Lines changed: 156 additions & 186 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)