Skip to content

Commit a3f50d1

Browse files
committed
Merge branch 'master' into sync_from_rust_2024_10_08
2 parents ad752f6 + 1190255 commit a3f50d1

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

libgccjit.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e744a9459d33864067214741daf5c5bc2a7b88c6
1+
a71dd583ec21d3695256471842db1f24e6ac5e9e

patches/0022-core-Disable-not-compiling-tests.patch

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 18793c6109890493ceb3ff36549849a36e3d8022 Mon Sep 17 00:00:00 2001
1+
From af0e237f056fa838c77463381a19b0dc993c0a35 Mon Sep 17 00:00:00 2001
22
From: None <none@example.com>
33
Date: Sun, 1 Sep 2024 11:42:17 -0400
4-
Subject: [PATCH] [core] Disable not compiling tests
4+
Subject: [PATCH] Disable not compiling tests
55

66
---
77
library/core/tests/Cargo.toml | 14 ++++++++++++++
@@ -30,14 +30,15 @@ index 0000000..ca326ac
3030
+rand = { version = "0.8.5", default-features = false }
3131
+rand_xorshift = { version = "0.3.0", default-features = false }
3232
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
33-
index 1e336bf..5800ebb 100644
33+
index 196e91e..47e26a5 100644
3434
--- a/library/core/tests/lib.rs
3535
+++ b/library/core/tests/lib.rs
3636
@@ -1,4 +1,5 @@
3737
// tidy-alphabetical-start
3838
+#![cfg(test)]
39-
#![cfg_attr(bootstrap, feature(offset_of_nested))]
39+
#![cfg_attr(bootstrap, feature(const_mut_refs))]
4040
#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
4141
#![cfg_attr(test, feature(cfg_match))]
42-
--
43-
2.46.0
42+
--
43+
2.46.2
44+

patches/libgccjit12/0001-core-Disable-portable-simd-test.patch

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,4 @@ index b71786c..cf484d5 100644
2727
mod slice;
2828
mod str;
2929
mod str_lossy;
30-
--
31-
2.45.2
30+
-- 2.45.2

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2024-08-11"
2+
channel = "nightly-2024-10-08"
33
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

tests/failing-ui-tests.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ tests/ui/delegation/fn-header.rs
9292
tests/ui/consts/zst_no_llvm_alloc.rs
9393
tests/ui/consts/const-eval/parse_ints.rs
9494
tests/ui/simd/intrinsic/generic-arithmetic-pass.rs
95+
tests/ui/simd/intrinsic/generic-as.rs
9596
tests/ui/backtrace/backtrace.rs
9697
tests/ui/lifetimes/tail-expr-lock-poisoning.rs
9798
tests/ui/runtime/rt-explody-panic-payloads.rs

tests/failing-ui-tests12.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ tests/ui/simd/array-type.rs
1111
tests/ui/simd/intrinsic/float-minmax-pass.rs
1212
tests/ui/simd/intrinsic/generic-arithmetic-pass.rs
1313
tests/ui/simd/intrinsic/generic-arithmetic-saturating-pass.rs
14-
tests/ui/simd/intrinsic/generic-as.rs
1514
tests/ui/simd/intrinsic/generic-cast-pass.rs
1615
tests/ui/simd/intrinsic/generic-cast-pointer-width.rs
1716
tests/ui/simd/intrinsic/generic-comparison-pass.rs

0 commit comments

Comments
 (0)