Skip to content

Commit 65c16dc

Browse files
borsbors
committed
Auto merge of #101960 - matthiaskrgr:rollup-1l5v7ip, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #101151 (Document x86_64-fortanix-unknown-sgx platform) - #101912 (Update `unicode-rs` crates to Unicode 15) - #101923 (Don't add rustdoc's CSS to other doc pages) - #101953 (Fix tooltip display for error codes) - #101954 (rustdoc: remove redundant `.location a { font-weight: 500 }`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents bc7b17c + c0e8d46 commit 65c16dc

File tree

10 files changed

+105
-29
lines changed

10 files changed

+105
-29
lines changed

‎Cargo.lock

+23-14
Original file line numberDiff line numberDiff line change
@@ -4890,9 +4890,18 @@ checksum = "29738eedb4388d9ea620eeab9384884fc3f06f586a2eddb56bedc5885126c7c1"
48904890

48914891
[[package]]
48924892
name = "tinyvec"
4893-
version = "0.3.4"
4893+
version = "1.6.0"
48944894
source = "registry+https://github.com/rust-lang/crates.io-index"
4895-
checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117"
4895+
checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
4896+
dependencies = [
4897+
"tinyvec_macros",
4898+
]
4899+
4900+
[[package]]
4901+
name = "tinyvec_macros"
4902+
version = "0.1.0"
4903+
source = "registry+https://github.com/rust-lang/crates.io-index"
4904+
checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
48964905

48974906
[[package]]
48984907
name = "tokio"
@@ -5180,40 +5189,40 @@ dependencies = [
51805189

51815190
[[package]]
51825191
name = "unicode-normalization"
5183-
version = "0.1.13"
5192+
version = "0.1.22"
51845193
source = "registry+https://github.com/rust-lang/crates.io-index"
5185-
checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
5194+
checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
51865195
dependencies = [
51875196
"tinyvec",
51885197
]
51895198

51905199
[[package]]
51915200
name = "unicode-script"
5192-
version = "0.5.3"
5201+
version = "0.5.5"
51935202
source = "registry+https://github.com/rust-lang/crates.io-index"
5194-
checksum = "098ec66172ce21cd55f8bcc786ee209dd20e04eff70acfca30cb79924d173ae9"
5203+
checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc"
51955204

51965205
[[package]]
51975206
name = "unicode-security"
5198-
version = "0.0.5"
5207+
version = "0.1.0"
51995208
source = "registry+https://github.com/rust-lang/crates.io-index"
5200-
checksum = "5d87c28edc5b263377e448d6cdcb935c06b95413d8013ba6fae470558ccab18f"
5209+
checksum = "9ef5756b3097992b934b06608c69f48448a0fbe804bb1e72b982f6d7983e9e63"
52015210
dependencies = [
52025211
"unicode-normalization",
52035212
"unicode-script",
52045213
]
52055214

52065215
[[package]]
52075216
name = "unicode-segmentation"
5208-
version = "1.9.0"
5217+
version = "1.10.0"
52095218
source = "registry+https://github.com/rust-lang/crates.io-index"
5210-
checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
5219+
checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
52115220

52125221
[[package]]
52135222
name = "unicode-width"
5214-
version = "0.1.8"
5223+
version = "0.1.10"
52155224
source = "registry+https://github.com/rust-lang/crates.io-index"
5216-
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
5225+
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
52175226
dependencies = [
52185227
"compiler_builtins",
52195228
"rustc-std-workspace-core",
@@ -5222,9 +5231,9 @@ dependencies = [
52225231

52235232
[[package]]
52245233
name = "unicode-xid"
5225-
version = "0.2.2"
5234+
version = "0.2.4"
52265235
source = "registry+https://github.com/rust-lang/crates.io-index"
5227-
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
5236+
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
52285237

52295238
[[package]]
52305239
name = "unicode_categories"

‎compiler/rustc_lint/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[dependencies]
77
tracing = "0.1"
8-
unicode-security = "0.0.5"
8+
unicode-security = "0.1.0"
99
rustc_middle = { path = "../rustc_middle" }
1010
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1111
rustc_attr = { path = "../rustc_attr" }

‎src/bootstrap/doc.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -383,15 +383,9 @@ impl Step for Standalone {
383383
}
384384

385385
if filename == "not_found.md" {
386-
cmd.arg("--markdown-css")
387-
.arg(format!("https://doc.rust-lang.org/rustdoc{}.css", &builder.version))
388-
.arg("--markdown-css")
389-
.arg("https://doc.rust-lang.org/rust.css");
386+
cmd.arg("--markdown-css").arg("https://doc.rust-lang.org/rust.css");
390387
} else {
391-
cmd.arg("--markdown-css")
392-
.arg(format!("rustdoc{}.css", &builder.version))
393-
.arg("--markdown-css")
394-
.arg("rust.css");
388+
cmd.arg("--markdown-css").arg("rust.css");
395389
}
396390
builder.run(&mut cmd);
397391
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
- [*-unknown-openbsd](platform-support/openbsd.md)
3434
- [\*-unknown-uefi](platform-support/unknown-uefi.md)
3535
- [wasm64-unknown-unknown](platform-support/wasm64-unknown-unknown.md)
36+
- [x86_64-fortanix-unknown-sgx](platform-support/x86_64-fortanix-unknown-sgx.md)
3637
- [x86_64-unknown-none](platform-support/x86_64-unknown-none.md)
3738
- [Targets](targets/index.md)
3839
- [Built-in Targets](targets/built-in.md)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ target | std | notes
174174
`wasm32-unknown-unknown` | ✓ | WebAssembly
175175
`wasm32-wasi` | ✓ | WebAssembly with WASI
176176
`x86_64-apple-ios` | ✓ | 64-bit x86 iOS
177-
`x86_64-fortanix-unknown-sgx` | ✓ | [Fortanix ABI] for 64-bit Intel SGX
177+
[`x86_64-fortanix-unknown-sgx`](platform-support/x86_64-fortanix-unknown-sgx.md) | ✓ | [Fortanix ABI] for 64-bit Intel SGX
178178
`x86_64-fuchsia` | ✓ | 64-bit Fuchsia
179179
`x86_64-linux-android` | ✓ | 64-bit x86 Android
180180
`x86_64-pc-solaris` | ✓ | 64-bit Solaris 10/11, illumos

‎src/doc/rustc/src/platform-support/x86_64-fortanix-unknown-sgx.md

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# `x86_64-fortanix-unknown-sgx`
2+
3+
**Tier: 2**
4+
5+
Secure enclaves using [Intel Software Guard Extensions
6+
(SGX)](https://www.intel.com/content/www/us/en/developer/tools/software-guard-extensions/overview.html)
7+
based on the ABI defined by Fortanix for the [Enclave Development Platform
8+
(EDP)](https://edp.fortanix.com/).
9+
10+
## Target maintainers
11+
12+
The [EDP team](mailto:[email protected]) at Fortanix.
13+
14+
- Jethro Beekman [@jethrogb](https://github.com/jethrogb)
15+
- Raoul Strackx [@raoulstrackx](https://github.com/raoulstrackx)
16+
- Mohsen Zohrevandi [@mzohreva](https://github.com/mzohreva)
17+
18+
## Requirements
19+
20+
The target supports `std` with a default allocator. Only cross compilation is
21+
supported.
22+
23+
Binaries support all CPUs that include Intel SGX. Only 64-bit mode is supported.
24+
25+
Not all `std` features are supported, see [Using Rust's
26+
std](https://edp.fortanix.com/docs/concepts/rust-std/) for details.
27+
28+
The `extern "C"` calling convention is the System V AMD64 ABI.
29+
30+
The supported ABI is the
31+
[fortanix-sgx-abi](https://edp.fortanix.com/docs/api/fortanix_sgx_abi/index.html).
32+
33+
The compiler output is ELF, but the native format for the platform is the SGX
34+
stream (SGXS) format. A converter like
35+
[ftxsgx-elf2sgxs](https://crates.io/crates/fortanix-sgx-tools) is needed.
36+
37+
Programs in SGXS format adhering to the Fortanix SGX ABI can be run with any
38+
compatible runner, such as
39+
[ftxsgx-runner](https://crates.io/crates/fortanix-sgx-tools).
40+
41+
See the [EDP installation
42+
guide](https://edp.fortanix.com/docs/installation/guide/) for recommendations
43+
on how to setup a development and runtime environment.
44+
45+
## Building the target
46+
47+
As a tier 2 target, the target is built by the Rust project.
48+
49+
You can configure rustbuild like so:
50+
51+
```toml
52+
[build]
53+
build-stage = 1
54+
target = ["x86_64-fortanix-unknown-sgx"]
55+
```
56+
57+
## Building Rust programs
58+
59+
Standard build flows using `cargo` or `rustc` should work.
60+
61+
## Testing
62+
63+
The Rust test suite as well as custom unit and integration tests will run on
64+
hardware that has Intel SGX enabled if a cargo runner is configured correctly,
65+
see the requirements section.
66+
67+
## Cross-compilation toolchains and C code
68+
69+
C code is not generally supported, as there is no libc. C code compiled for
70+
x86-64 in freestanding mode using the System V AMD64 ABI may work. The
71+
[rs-libc](https://crates.io/crates/rs-libc) crate contains a subset of libc
72+
that's known to work with this target.

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

-4
Original file line numberDiff line numberDiff line change
@@ -533,10 +533,6 @@ img {
533533
border: none;
534534
}
535535

536-
.location a:first-of-type {
537-
font-weight: 500;
538-
}
539-
540536
.block ul, .block li {
541537
padding: 0;
542538
margin: 0;

‎src/tools/error_index_generator/error-index.css

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ pre .tooltip::before {
2727
content: " ";
2828
position: absolute;
2929
top: 50%;
30-
left: 16px;
30+
left: 2px;
3131
margin-top: -5px;
3232
border-width: 5px;
3333
border-style: solid;
34+
height: 0px;
3435
}
3536

3637
pre .tooltip:hover::before, pre .tooltip:hover::after {

‎src/tools/linkchecker/main.rs

+1
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ impl Checker {
215215
|| url.starts_with("ftp:")
216216
|| url.starts_with("irc:")
217217
|| url.starts_with("data:")
218+
|| url.starts_with("mailto:")
218219
{
219220
report.links_ignored_external += 1;
220221
return;

‎src/tools/tidy/src/deps.rs

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const LICENSES: &[&str] = &[
2020
"Unlicense OR MIT",
2121
"0BSD OR MIT OR Apache-2.0", // adler license
2222
"Zlib OR Apache-2.0 OR MIT", // tinyvec
23+
"MIT OR Apache-2.0 OR Zlib", // tinyvec_macros
2324
"MIT OR Zlib OR Apache-2.0", // miniz_oxide
2425
];
2526

@@ -218,6 +219,7 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
218219
"time",
219220
"tinystr",
220221
"tinyvec",
222+
"tinyvec_macros",
221223
"thin-vec",
222224
"tracing",
223225
"tracing-attributes",

0 commit comments

Comments
 (0)