From 45e3b1f441374095b5cdd927e2aebdf5ad0e5e26 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 9 Apr 2025 13:42:40 +0200 Subject: [PATCH 1/2] Update charon --- flake.lock | 14 +++++++------- out/test-partial_eq/partial_eq.c | 2 +- out/test-partial_eq/partial_eq.h | 2 +- test/partial_eq_stubs.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 2eb9bad2..643fa637 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1743501557, - "narHash": "sha256-bZZfS0bwHRQh6p3svYqVBo65xdJgVejutU1oCd2QyKM=", + "lastModified": 1744198659, + "narHash": "sha256-6KzSgZY0WQ4iWPpcslP/9j+Wf5LBVkYabEbHE2jq1U0=", "owner": "aeneasverif", "repo": "charon", - "rev": "99432e1474433e9eaed946539c12d45e72486e79", + "rev": "5732b0e22e986b14a793d4ce7a9ff8118822c748", "type": "github" }, "original": { @@ -187,17 +187,17 @@ ] }, "locked": { - "lastModified": 1737340068, - "narHash": "sha256-5UciRckNV+YOZ6y6ASBIb01cySB12whDxgFUK+EqT8g=", + "lastModified": 1743475035, + "narHash": "sha256-uLjVsb4Rxnp1zmFdPCDmdODd4RY6ETOeRj0IkC0ij/4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "275c824ed9e90e7fd4f96d187bde3670062e721f", + "rev": "bee11c51c2cda3ac57c9e0149d94b86cc1b00d13", "type": "github" }, "original": { "owner": "oxalica", "repo": "rust-overlay", - "rev": "275c824ed9e90e7fd4f96d187bde3670062e721f", + "rev": "bee11c51c2cda3ac57c9e0149d94b86cc1b00d13", "type": "github" } }, diff --git a/out/test-partial_eq/partial_eq.c b/out/test-partial_eq/partial_eq.c index e1d631d5..9af2d91e 100644 --- a/out/test-partial_eq/partial_eq.c +++ b/out/test-partial_eq/partial_eq.c @@ -36,6 +36,6 @@ This function found in impl {(core::fmt::Debug for partial_eq::Enum)#2} */ inline core_result_Result_a9 partial_eq_fmt_19(partial_eq_Enum *self, core_fmt_Formatter *f) { - return core_fmt__core__fmt__Formatter__a__9__write_str(f, "A"); + return core_fmt__core__fmt__Formatter__a__11__write_str(f, "A"); } diff --git a/out/test-partial_eq/partial_eq.h b/out/test-partial_eq/partial_eq.h index 9796dfed..9e9cb666 100644 --- a/out/test-partial_eq/partial_eq.h +++ b/out/test-partial_eq/partial_eq.h @@ -33,7 +33,7 @@ typedef struct core_result_Result_a9_s core_result_Result_a9; extern core_result_Result_a9 -core_fmt__core__fmt__Formatter__a__9__write_str(core_fmt_Formatter *x0, Prims_string x1); +core_fmt__core__fmt__Formatter__a__11__write_str(core_fmt_Formatter *x0, Prims_string x1); #define core_panicking_AssertKind_Eq 0 #define core_panicking_AssertKind_Ne 1 diff --git a/test/partial_eq_stubs.c b/test/partial_eq_stubs.c index 155fba0f..e9dd2400 100644 --- a/test/partial_eq_stubs.c +++ b/test/partial_eq_stubs.c @@ -1,6 +1,6 @@ #include "partial_eq.h" extern core_result_Result_a9 -core_fmt__core__fmt__Formatter__a__9__write_str(core_fmt_Formatter *x0, Prims_string x1) { +core_fmt__core__fmt__Formatter__a__11__write_str(core_fmt_Formatter *x0, Prims_string x1) { return ((core_result_Result_a9){ .tag = core_result_Ok, .f0 = NULL }); } From bf09f82a56f6285aba761d4078097e41da2288f8 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 9 Apr 2025 13:43:52 +0200 Subject: [PATCH 2/2] Also check ml-dsa in CI --- .github/workflows/nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml index 8f8272d8..8f496603 100644 --- a/.github/workflows/nix.yaml +++ b/.github/workflows/nix.yaml @@ -50,3 +50,4 @@ jobs: nix flake update charon --override-input charon github:aeneasverif/charon/$CHARON_REV nix flake update eurydice --override-input eurydice github:aeneasverif/eurydice/$EURYDICE_REV ./check.sh ml-kem-small + ./check.sh ml-dsa-small