Skip to content

Commit 0a27ac1

Browse files
borsbors
committed
Auto merge of #101838 - matthiaskrgr:rollup-d1nm6b3, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #100415 (Add BE8 support) - #101559 (Adding "backtrace off" option for fuchsia targets) - #101740 (Adding ignore-fuchsia arg to non-applicable compiler ui tests) - #101778 (rustdoc: clean up DOM by removing `.dockblock-short p`) - #101786 (Tidy will not check coding style in bootstrap/target) - #101810 (Constify `PartialEq` for `Ordering`) - #101812 (rustdoc: clean up CSS `#titles` using flexbox) - #101820 (rustdoc: remove no-op rule `a { background: transparent }`) - #101828 (Add test for #101743) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents c3f5929 + 384fee9 commit 0a27ac1

20 files changed

+184
-80
lines changed

‎compiler/rustc_target/src/spec/armeb_unknown_linux_gnueabi.rs

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
use crate::abi::Endian;
2+
use crate::spec::{Target, TargetOptions};
3+
4+
pub fn target() -> Target {
5+
Target {
6+
llvm_target: "armeb-unknown-linux-gnueabi".into(),
7+
pointer_width: 32,
8+
data_layout: "E-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
9+
arch: "arm".into(),
10+
options: TargetOptions {
11+
abi: "eabi".into(),
12+
features: "+strict-align,+v8,+crc".into(),
13+
endian: Endian::Big,
14+
max_atomic_width: Some(64),
15+
mcount: "\u{1}__gnu_mcount_nc".into(),
16+
..super::linux_gnu_base::opts()
17+
},
18+
}
19+
}

‎compiler/rustc_target/src/spec/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,7 @@ supported_targets! {
932932
("sparc64-unknown-linux-gnu", sparc64_unknown_linux_gnu),
933933
("arm-unknown-linux-gnueabi", arm_unknown_linux_gnueabi),
934934
("arm-unknown-linux-gnueabihf", arm_unknown_linux_gnueabihf),
935+
("armeb-unknown-linux-gnueabi", armeb_unknown_linux_gnueabi),
935936
("arm-unknown-linux-musleabi", arm_unknown_linux_musleabi),
936937
("arm-unknown-linux-musleabihf", arm_unknown_linux_musleabihf),
937938
("armv4t-unknown-linux-gnueabi", armv4t_unknown_linux_gnueabi),

‎library/core/src/cmp.rs

+14-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#![stable(feature = "rust1", since = "1.0.0")]
2424

2525
use crate::marker::Destruct;
26+
use crate::marker::StructuralPartialEq;
2627

2728
use self::Ordering::*;
2829

@@ -338,7 +339,7 @@ pub struct AssertParamIsEq<T: Eq + ?Sized> {
338339
/// let result = 2.cmp(&1);
339340
/// assert_eq!(Ordering::Greater, result);
340341
/// ```
341-
#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
342+
#[derive(Clone, Copy, Eq, Debug, Hash)]
342343
#[stable(feature = "rust1", since = "1.0.0")]
343344
#[repr(i8)]
344345
pub enum Ordering {
@@ -884,6 +885,18 @@ pub macro Ord($item:item) {
884885
/* compiler built-in */
885886
}
886887

888+
#[stable(feature = "rust1", since = "1.0.0")]
889+
impl StructuralPartialEq for Ordering {}
890+
891+
#[stable(feature = "rust1", since = "1.0.0")]
892+
#[rustc_const_unstable(feature = "const_cmp", issue = "92391")]
893+
impl const PartialEq for Ordering {
894+
#[inline]
895+
fn eq(&self, other: &Self) -> bool {
896+
(*self as i32).eq(&(*other as i32))
897+
}
898+
}
899+
887900
#[stable(feature = "rust1", since = "1.0.0")]
888901
#[rustc_const_unstable(feature = "const_cmp", issue = "92391")]
889902
impl const Ord for Ordering {

‎library/std/src/panic.rs

+16-17
Original file line numberDiff line numberDiff line change
@@ -295,23 +295,22 @@ pub fn get_backtrace_style() -> Option<BacktraceStyle> {
295295
return Some(style);
296296
}
297297

298-
// Setting environment variables for Fuchsia components isn't a standard
299-
// or easily supported workflow. For now, display backtraces by default.
300-
let format = if cfg!(target_os = "fuchsia") {
301-
BacktraceStyle::Full
302-
} else {
303-
crate::env::var_os("RUST_BACKTRACE")
304-
.map(|x| {
305-
if &x == "0" {
306-
BacktraceStyle::Off
307-
} else if &x == "full" {
308-
BacktraceStyle::Full
309-
} else {
310-
BacktraceStyle::Short
311-
}
312-
})
313-
.unwrap_or(BacktraceStyle::Off)
314-
};
298+
let format = crate::env::var_os("RUST_BACKTRACE")
299+
.map(|x| {
300+
if &x == "0" {
301+
BacktraceStyle::Off
302+
} else if &x == "full" {
303+
BacktraceStyle::Full
304+
} else {
305+
BacktraceStyle::Short
306+
}
307+
})
308+
.unwrap_or(if cfg!(target_os = "fuchsia") {
309+
// Fuchsia components default to full backtrace.
310+
BacktraceStyle::Full
311+
} else {
312+
BacktraceStyle::Off
313+
});
315314
set_backtrace_style(format);
316315
Some(format)
317316
}

‎src/doc/rustc/src/SUMMARY.md

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- [aarch64-apple-ios-sim](platform-support/aarch64-apple-ios-sim.md)
1919
- [\*-apple-watchos\*](platform-support/apple-watchos.md)
2020
- [aarch64-nintendo-switch-freestanding](platform-support/aarch64-nintendo-switch-freestanding.md)
21+
- [armeb-unknown-linux-gnueabi](platform-support/armeb-unknown-linux-gnueabi.md)
2122
- [armv4t-none-eabi](platform-support/armv4t-none-eabi.md)
2223
- [armv6k-nintendo-3ds](platform-support/armv6k-nintendo-3ds.md)
2324
- [armv7-unknown-linux-uclibceabi](platform-support/armv7-unknown-linux-uclibceabi.md)

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

+1
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ target | std | host | notes
223223
`aarch64_be-unknown-linux-gnu_ilp32` | ✓ | ✓ | ARM64 Linux (big-endian, ILP32 ABI)
224224
`aarch64_be-unknown-linux-gnu` | ✓ | ✓ | ARM64 Linux (big-endian)
225225
[`arm64_32-apple-watchos`](platform-support/apple-watchos.md) | ✓ | | ARM Apple WatchOS 64-bit with 32-bit pointers
226+
[`armeb-unknown-linux-gnueabi`](platform-support/armeb-unknown-linux-gnueabi.md) | ✓ | ? | ARM BE8 the default ARM big-endian architecture since [ARMv6](https://developer.arm.com/documentation/101754/0616/armlink-Reference/armlink-Command-line-Options/--be8?lang=en).
226227
`armv4t-none-eabi` | * | | ARMv4T A32
227228
`armv4t-unknown-linux-gnueabi` | ? | |
228229
`armv5te-unknown-linux-uclibceabi` | ? | | ARMv5TE Linux with uClibc

‎src/doc/rustc/src/platform-support/armeb-unknown-linux-gnueabi.md

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# armeb-unknown-linux-gnueabi
2+
**Tier: 3**
3+
4+
Target for cross-compiling Linux user-mode applications targetting the ARM BE8 architecture.
5+
6+
## Overview
7+
BE8 architecture retains the same little-endian ordered code-stream used by conventional little endian ARM systems, however the data accesses are in big-endian. BE8 is used primarily in high-performance networking applications where the ability to read packets in their native "Network Byte Order" is important (many network protocols transmit data in big-endian byte order for their wire formats).
8+
9+
## History
10+
BE8 architecture is the default big-endian architecture for ARM since [ARMv6](https://developer.arm.com/documentation/101754/0616/armlink-Reference/armlink-Command-line-Options/--be8?lang=en). It's predecessor, used for ARMv4 and ARMv5 devices was [BE32](https://developer.arm.com/documentation/dui0474/j/linker-command-line-options/--be32). On ARMv6 architecture, endianness can be configured via [system registers](https://developer.arm.com/documentation/ddi0290/g/unaligned-and-mixed-endian-data-access-support/mixed-endian-access-support/interaction-between-the-bus-protocol-and-the-core-endianness). However, BE32 was withdrawn for [ARMv7](https://developer.arm.com/documentation/ddi0406/cb/Appendixes/Deprecated-and-Obsolete-Features/Obsolete-features/Support-for-BE-32-endianness-model) onwards.
11+
12+
## Target Maintainers
13+
* [@WorksButNotTested](https://github.com/WorksButNotTested)
14+
15+
## Requirements
16+
The target is cross-compiled. This target supports `std` in the normal way (indeed only nominal changes are required from the standard ARM configuration).
17+
18+
## Target definition
19+
The target definition can be seen [here](https://github.com/rust-lang/rust/tree/master/compiler/rustc_target/src/spec/armeb_unknown_linux_gnueabi.rs). In particular, it should be noted that the `features` specify that this target is built for the ARMv8 core. Though this can likely be modified as required.
20+
21+
## Building the target
22+
Because it is Tier 3, rust does not yet ship pre-compiled artifacts for this target.
23+
24+
Therefore, you can build Rust with support for the target by adding it to the target list in config.toml, a sample configuration is shown below. It is expected that the user already have a working GNU compiler toolchain and update the paths accordingly.
25+
26+
```toml
27+
[llvm]
28+
download-ci-llvm = false
29+
skip-rebuild = true
30+
optimize = true
31+
ninja = true
32+
targets = "ARM;X86"
33+
clang = false
34+
35+
[build]
36+
target = ["x86_64-unknown-linux-gnu", "armeb-unknown-linux-gnueabi"]
37+
docs = false
38+
docs-minification = false
39+
compiler-docs = false
40+
[install]
41+
prefix = "/home/user/x-tools/rust/"
42+
43+
[rust]
44+
debug-logging=true
45+
backtrace = true
46+
incremental = true
47+
48+
[target.x86_64-unknown-linux-gnu]
49+
50+
[dist]
51+
52+
[target.armeb-unknown-linux-gnueabi]
53+
cc = "/home/user/x-tools/armeb-unknown-linux-gnueabi/bin/armeb-unknown-linux-gnueabi-gcc"
54+
cxx = "/home/user/x-tools/armeb-unknown-linux-gnueabi/bin/armeb-unknown-linux-gnueabi-g++"
55+
ar = "/home/user/x-tools/armeb-unknown-linux-gnueabi/bin/armeb-unknown-linux-gnueabi-ar"
56+
ranlib = "/home/user/x-tools/armeb-unknown-linux-gnueabi/bin/armeb-unknown-linux-gnueabi-ranlib"
57+
linker = "/home/user/x-tools/armeb-unknown-linux-gnueabi/bin/armeb-unknown-linux-gnueabi-gcc"
58+
llvm-config = "/home/user/x-tools/clang/bin/llvm-config"
59+
llvm-filecheck = "/home/user/x-tools/clang/bin/FileCheck"
60+
```
61+
62+
## Building Rust programs
63+
64+
The following `.cargo/config` is needed inside any project directory to build for the BE8 target:
65+
66+
```toml
67+
[build]
68+
target = "armeb-unknown-linux-gnueabi"
69+
70+
[target.armeb-unknown-linux-gnueabi]
71+
linker = "armeb-unknown-linux-gnueabi-gcc"
72+
```
73+
74+
Note that it is expected that the user has a suitable linker from the GNU toolchain.

‎src/librustdoc/html/markdown.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,11 @@ impl MarkdownSummaryLine<'_> {
11191119

11201120
let mut s = String::new();
11211121

1122-
html::push_html(&mut s, LinkReplacer::new(SummaryLine::new(p), links));
1122+
let without_paragraphs = LinkReplacer::new(SummaryLine::new(p), links).filter(|event| {
1123+
!matches!(event, Event::Start(Tag::Paragraph) | Event::End(Tag::Paragraph))
1124+
});
1125+
1126+
html::push_html(&mut s, without_paragraphs);
11231127

11241128
s
11251129
}

‎src/librustdoc/html/static/css/rustdoc.css

+7-29
Original file line numberDiff line numberDiff line change
@@ -609,16 +609,12 @@ h2.location a {
609609
.docblock-short {
610610
overflow-wrap: break-word;
611611
overflow-wrap: anywhere;
612-
}
613-
.docblock-short p {
614-
display: inline;
615612
overflow: hidden;
616613
text-overflow: ellipsis;
617-
margin: 0;
618614
}
619615
/* Wrap non-pre code blocks (`text`) but not (```text```). */
620616
.docblock > :not(pre) > code,
621-
.docblock-short > :not(pre) > code {
617+
.docblock-short > code {
622618
white-space: pre-wrap;
623619
}
624620

@@ -758,7 +754,6 @@ nav.sub form { display: inline; }
758754

759755
a {
760756
text-decoration: none;
761-
background: transparent;
762757
}
763758

764759
.small-section-header {
@@ -1369,27 +1364,19 @@ pre.rust {
13691364
}
13701365

13711366
#titles {
1372-
height: 35px;
1367+
display: flex;
1368+
flex-direction: row;
1369+
gap: 1px;
1370+
margin-bottom: 4px;
13731371
}
13741372

13751373
#titles > button {
1376-
float: left;
1377-
width: 33.3%;
13781374
text-align: center;
13791375
font-size: 1.125rem;
13801376
cursor: pointer;
13811377
border: 0;
13821378
border-top: 2px solid;
1383-
}
1384-
1385-
#titles > button:first-child:last-child {
1386-
margin-right: 1px;
1387-
width: calc(100% - 1px);
1388-
}
1389-
1390-
#titles > button:not(:last-child) {
1391-
margin-right: 1px;
1392-
width: calc(33.3% - 1px);
1379+
flex: 1;
13931380
}
13941381

13951382
#titles > button > div.count {
@@ -1886,12 +1873,7 @@ in storage.js plus the media query with (min-width: 701px)
18861873
}
18871874

18881875
#titles > button > div.count {
1889-
float: left;
1890-
width: 100%;
1891-
}
1892-
1893-
#titles {
1894-
height: 50px;
1876+
display: block;
18951877
}
18961878

18971879
/* Because of ios, we need to actually have a full height sidebar title so the
@@ -2022,10 +2004,6 @@ in storage.js plus the media query with (min-width: 701px)
20222004
}
20232005

20242006
@media (max-width: 464px) {
2025-
#titles, #titles > button {
2026-
height: 73px;
2027-
}
2028-
20292007
#crate-search {
20302008
border-radius: 4px;
20312009
}

‎src/test/rustdoc-gui/label-next-to-symbol.goml

+3-15
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,9 @@ compare-elements-position: (
3131
)
3232

3333
// Ensure no wrap
34-
compare-elements-position-near: (
35-
"//*[@class='item-left module-item']//a[text()='replaced_function']",
36-
"//*[@class='item-right docblock-short']//p[text()='a thing with a label']",
37-
{"y": 2},
38-
)
39-
// compare parent elements
4034
compare-elements-position: (
4135
"//*[@class='item-left module-item']//a[text()='replaced_function']/..",
42-
"//*[@class='item-right docblock-short']//p[text()='a thing with a label']/..",
36+
"//*[@class='item-right docblock-short'][text()='a thing with a label']",
4337
("y"),
4438
)
4539

@@ -60,19 +54,13 @@ compare-elements-position: (
6054
)
6155

6256
// Ensure wrap
63-
compare-elements-position-near-false: (
64-
"//*[@class='item-left module-item']//a[text()='replaced_function']",
65-
"//*[@class='item-right docblock-short']//p[text()='a thing with a label']",
66-
{"y": 12},
67-
)
68-
// compare parent elements
6957
compare-elements-position-false: (
7058
"//*[@class='item-left module-item']//a[text()='replaced_function']/..",
71-
"//*[@class='item-right docblock-short']//p[text()='a thing with a label']/..",
59+
"//*[@class='item-right docblock-short'][text()='a thing with a label']",
7260
("y"),
7361
)
7462
compare-elements-position-false: (
7563
".item-left .stab.deprecated",
76-
"//*[@class='item-right docblock-short']//p[text()='a thing with a label']",
64+
"//*[@class='item-right docblock-short'][text()='a thing with a label']",
7765
("y"),
7866
)

‎src/test/rustdoc/issue-101743-bold-tag.rs

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Regression test for https://github.com/rust-lang/rust/issues/101743
2+
3+
#![crate_name="foo"]
4+
5+
pub type Word = usize;
6+
pub struct Repr<const B: usize>([i32; B]);
7+
pub struct IBig(usize);
8+
9+
pub const fn base_as_ibig<const B: Word>() -> IBig {
10+
IBig(B)
11+
}
12+
13+
impl<const B: Word> Repr<B> {
14+
// If we change back to rendering the value of consts, check this doesn't add
15+
// a <b> tag, but escapes correctly
16+
17+
// @has foo/struct.Repr.html '//section[@id="associatedconstant.BASE"]/h4' '= _'
18+
pub const BASE: IBig = base_as_ibig::<B>();
19+
}

‎src/test/rustdoc/short-docblock.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
#![crate_name = "foo"]
22

3-
// @has foo/index.html '//*[@class="item-right docblock-short"]/p' 'fooo'
4-
// @!has foo/index.html '//*[@class="item-right docblock-short"]/p/h1' 'fooo'
3+
// @has foo/index.html '//*[@class="item-right docblock-short"]' 'fooo'
4+
// @!has foo/index.html '//*[@class="item-right docblock-short"]/h1' 'fooo'
55
// @has foo/fn.foo.html '//h2[@id="fooo"]/a[@href="#fooo"]' 'fooo'
66

77
/// # fooo
88
///
99
/// foo
1010
pub fn foo() {}
1111

12-
// @has foo/index.html '//*[@class="item-right docblock-short"]/p' 'mooood'
13-
// @!has foo/index.html '//*[@class="item-right docblock-short"]/p/h2' 'mooood'
12+
// @has foo/index.html '//*[@class="item-right docblock-short"]' 'mooood'
13+
// @!has foo/index.html '//*[@class="item-right docblock-short"]/h2' 'mooood'
1414
// @has foo/foo/index.html '//h3[@id="mooood"]/a[@href="#mooood"]' 'mooood'
1515

1616
/// ## mooood
1717
///
1818
/// foo mod
1919
pub mod foo {}
2020

21-
// @has foo/index.html '//*[@class="item-right docblock-short"]/p/a[@href=\
21+
// @has foo/index.html '//*[@class="item-right docblock-short"]/a[@href=\
2222
// "https://nougat.world"]/code' 'nougat'
2323

2424
/// [`nougat`](https://nougat.world)

0 commit comments

Comments
 (0)