From f255b4db8c6dda651cb2fbefebac9c3da99d8634 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 16 Aug 2026 22:19:59 +0200 Subject: [PATCH 1/2] make memcmp test less constrained --- tests/pass-dep/libc/libc-mem.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/pass-dep/libc/libc-mem.rs b/tests/pass-dep/libc/libc-mem.rs index 202727b198..a64a23aa5a 100644 --- a/tests/pass-dep/libc/libc-mem.rs +++ b/tests/pass-dep/libc/libc-mem.rs @@ -344,9 +344,9 @@ fn test_memset() { fn test_memcmp() { unsafe { - assert_eq!(libc::memcmp(b"123".as_ptr().cast(), b"132".as_ptr().cast(), 3), -1); - assert_eq!(libc::memcmp(b"abc".as_ptr().cast(), b"aaa".as_ptr().cast(), 3), 1); - assert_eq!(libc::memcmp(b"xyz".as_ptr().cast(), b"xyz".as_ptr().cast(), 3), 0); + assert!(libc::memcmp(b"123".as_ptr().cast(), b"132".as_ptr().cast(), 3) < 0); + assert!(libc::memcmp(b"abc".as_ptr().cast(), b"aaa".as_ptr().cast(), 3) > 0); + assert!(libc::memcmp(b"xyz".as_ptr().cast(), b"xyz".as_ptr().cast(), 3) == 0); } } From 45a2945edc669ac37b770882cf0f7b7ea5960bf4 Mon Sep 17 00:00:00 2001 From: The Miri Cronjob Bot Date: Mon, 17 Aug 2026 04:32:40 +0000 Subject: [PATCH 2/2] Prepare for merging from rust-lang/rust This updates the rust-version file to 2c39ff499469be916d4e45506d1afed69bbaddb7. --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index 6c163e62d9..2f175e9668 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -67854e511de21d881bb16426996cd4259d44aa2e +2c39ff499469be916d4e45506d1afed69bbaddb7