Skip to content

Commit 96624b0

Browse files
committed
bump Rust, patch no longer needed
1 parent 6701755 commit 96624b0

File tree

2 files changed

+1
-25
lines changed

2 files changed

+1
-25
lines changed

rust-src.diff

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +0,0 @@
1-
diff --git a/library/alloc/tests/arc.rs b/library/alloc/tests/arc.rs
2-
index eb379e4d6a1..9191fa95150 100644
3-
--- a/library/alloc/tests/arc.rs
4-
+++ b/library/alloc/tests/arc.rs
5-
@@ -212,6 +212,7 @@ fn hmm<'a>(val: &'a mut Weak<&'a str>) -> Weak<&'a str> {
6-
}
7-
8-
#[test]
9-
+#[cfg_attr(miri, ignore)] // test has UB (https://github.com/rust-lang/rust/issues/104565)
10-
fn arc_from_vec_opt() {
11-
let mut v = Vec::with_capacity(64);
12-
v.push(0usize);
13-
diff --git a/library/alloc/tests/rc.rs b/library/alloc/tests/rc.rs
14-
index 1d5f3c52006..0a19162a402 100644
15-
--- a/library/alloc/tests/rc.rs
16-
+++ b/library/alloc/tests/rc.rs
17-
@@ -208,6 +208,7 @@ fn hmm<'a>(val: &'a mut Weak<&'a str>) -> Weak<&'a str> {
18-
}
19-
20-
#[test]
21-
+#[cfg_attr(miri, ignore)] // test has UB (https://github.com/rust-lang/rust/issues/104565)
22-
fn rc_from_vec_opt() {
23-
let mut v = Vec::with_capacity(64);
24-
v.push(0usize);

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2022-11-19
1+
nightly-2022-11-20

0 commit comments

Comments
 (0)