Skip to content

Commit 7646ece

Browse files
committed
Auto merge of rust-lang#115246 - matthiaskrgr:rollup-zdiw9gt, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - rust-lang#115197 (Remove special cases that are no longer needed due to rust-lang#112606) - rust-lang#115210 (Make `rustc_on_unimplemented` std-agnostic for `alloc::rc`) - rust-lang#115237 (Fixup sparc-unknown-none-elf table spacing) - rust-lang#115244 (Migrate GUI colors test to original CSS color format) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6ed4136 + f0bbc25 commit 7646ece

File tree

4 files changed

+13
-20
lines changed

4 files changed

+13
-20
lines changed

library/core/src/marker.rs

+2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ macro marker_impls {
7777
#[cfg_attr(not(test), rustc_diagnostic_item = "Send")]
7878
#[rustc_on_unimplemented(
7979
on(_Self = "std::rc::Rc<T, A>", note = "use `std::sync::Arc` instead of `std::rc::Rc`"),
80+
on(_Self = "alloc::rc::Rc<T, A>", note = "use `alloc::sync::Arc` instead of `alloc::rc::Rc`"),
8081
message = "`{Self}` cannot be sent between threads safely",
8182
label = "`{Self}` cannot be sent between threads safely",
8283
note = "consider using `std::sync::Arc<{Self}>`; for more information visit \
@@ -632,6 +633,7 @@ impl<T: ?Sized> Copy for &T {}
632633
note = "if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock` instead",
633634
),
634635
on(_Self = "std::rc::Rc<T, A>", note = "use `std::sync::Arc` instead of `std::rc::Rc`"),
636+
on(_Self = "alloc::rc::Rc<T, A>", note = "use `alloc::sync::Arc` instead of `alloc::rc::Rc`"),
635637
message = "`{Self}` cannot be shared between threads safely",
636638
label = "`{Self}` cannot be shared between threads safely",
637639
note = "consider using `std::sync::Arc<{Self}>`; for more information visit \

library/core/src/net/ip_addr.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -1856,13 +1856,7 @@ impl fmt::Display for Ipv6Addr {
18561856
if f.precision().is_none() && f.width().is_none() {
18571857
let segments = self.segments();
18581858

1859-
// Special case for :: and ::1; otherwise they get written with the
1860-
// IPv4 formatter
1861-
if self.is_unspecified() {
1862-
f.write_str("::")
1863-
} else if self.is_loopback() {
1864-
f.write_str("::1")
1865-
} else if let Some(ipv4) = self.to_ipv4_mapped() {
1859+
if let Some(ipv4) = self.to_ipv4_mapped() {
18661860
write!(f, "::ffff:{}", ipv4)
18671861
} else {
18681862
#[derive(Copy, Clone, Default)]

src/doc/rustc/src/platform-support.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ target | std | host | notes
313313
[`riscv64-linux-android`](platform-support/android.md) | | | RISC-V 64-bit Android
314314
`s390x-unknown-linux-musl` | | | S390x Linux (kernel 3.2, MUSL)
315315
`sparc-unknown-linux-gnu` | ✓ | | 32-bit SPARC Linux
316-
[`sparc-unknown-none-elf`](./platform-support/sparc-unknown-none-elf.md) | * | Bare 32-bit SPARC V7+
316+
[`sparc-unknown-none-elf`](./platform-support/sparc-unknown-none-elf.md) | * | | Bare 32-bit SPARC V7+
317317
[`sparc64-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/sparc64
318318
[`sparc64-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | OpenBSD/sparc64
319319
`thumbv4t-none-eabi` | * | | Thumb-mode Bare ARMv4T

tests/rustdoc-gui/warning-block.goml

+9-12
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ show-text: true
44

55
define-function: (
66
"check-warning",
7-
(theme, color, border_color, background_color),
7+
(theme, color, border_color),
88
block {
99
set-local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
1010
reload:
@@ -14,32 +14,29 @@ define-function: (
1414
"margin-bottom": "12px",
1515
"color": |color|,
1616
"border-left": "2px solid " + |border_color|,
17-
"background-color": |background_color|,
17+
"background-color": "transparent",
1818
})
1919
assert-css: ("#doc-warning-2", {
2020
"margin-bottom": "0px",
2121
"color": |color|,
2222
"border-left": "2px solid " + |border_color|,
23-
"background-color": |background_color|,
23+
"background-color": "transparent",
2424
})
2525
},
2626
)
2727

2828
call-function: ("check-warning", {
2929
"theme": "ayu",
30-
"color": "rgb(197, 197, 197)",
31-
"border_color": "rgb(255, 142, 0)",
32-
"background_color": "rgba(0, 0, 0, 0)",
30+
"color": "#c5c5c5",
31+
"border_color": "#ff8e00",
3332
})
3433
call-function: ("check-warning", {
3534
"theme": "dark",
36-
"color": "rgb(221, 221, 221)",
37-
"border_color": "rgb(255, 142, 0)",
38-
"background_color": "rgba(0, 0, 0, 0)",
35+
"color": "#ddd",
36+
"border_color": "#ff8e00",
3937
})
4038
call-function: ("check-warning", {
4139
"theme": "light",
42-
"color": "rgb(0, 0, 0)",
43-
"border_color": "rgb(255, 142, 0)",
44-
"background_color": "rgba(0, 0, 0, 0)",
40+
"color": "black",
41+
"border_color": "#ff8e00",
4542
})

0 commit comments

Comments
 (0)