Skip to content

Commit 8f5f607

Browse files
CentrilCentril
authored
Rollup merge of rust-lang#62936 - Centril:rollup-d702q3x, r=Centril
Rollup of 10 pull requests Successful merges: - rust-lang#60938 (rustdoc: make #[doc(include)] relative to the containing file) - rust-lang#61890 (Fix some sanity checks) - rust-lang#62261 (Take substs into account in `conservative_is_privately_uninhabited`) - rust-lang#62528 (Add joining slices of slices with a slice separator, not just a single item) - rust-lang#62735 (Turn `#[global_allocator]` into a regular attribute macro) - rust-lang#62801 (Remove support for -Zlower-128bit-ops) - rust-lang#62808 (Revert "Disable stack probing for gnux32.") - rust-lang#62819 (Display name of crate requiring rustc_private in error messages.) - rust-lang#62904 (Disable d32 on armv6 hf targets) - rust-lang#62907 (Initialize the MSP430 AsmParser) Failed merges: r? @ghost
2 parents 7451c7f + c9cdfa1 commit 8f5f607

File tree

77 files changed

+801
-1424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+801
-1424
lines changed

‎Cargo.lock‎

Lines changed: 19 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies = [
1717
name = "alloc"
1818
version = "0.0.0"
1919
dependencies = [
20-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
20+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
2121
"core 0.0.0",
2222
"rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
2323
"rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -110,7 +110,7 @@ dependencies = [
110110
"autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
111111
"backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
112112
"cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
113-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
113+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
114114
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
115115
"rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
116116
"rustc-std-workspace-core 1.0.0",
@@ -122,7 +122,7 @@ version = "0.1.27"
122122
source = "registry+https://github.com/rust-lang/crates.io-index"
123123
dependencies = [
124124
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
125-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
125+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
126126
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
127127
"rustc-std-workspace-core 1.0.0",
128128
]
@@ -335,7 +335,7 @@ name = "cfg-if"
335335
version = "0.1.8"
336336
source = "registry+https://github.com/rust-lang/crates.io-index"
337337
dependencies = [
338-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
338+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
339339
"rustc-std-workspace-core 1.0.0",
340340
]
341341

@@ -464,7 +464,7 @@ dependencies = [
464464

465465
[[package]]
466466
name = "compiler_builtins"
467-
version = "0.1.17"
467+
version = "0.1.18"
468468
source = "registry+https://github.com/rust-lang/crates.io-index"
469469
dependencies = [
470470
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -795,7 +795,7 @@ name = "dlmalloc"
795795
version = "0.1.3"
796796
source = "registry+https://github.com/rust-lang/crates.io-index"
797797
dependencies = [
798-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
798+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
799799
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
800800
"rustc-std-workspace-core 1.0.0",
801801
]
@@ -960,7 +960,7 @@ name = "fortanix-sgx-abi"
960960
version = "0.3.2"
961961
source = "registry+https://github.com/rust-lang/crates.io-index"
962962
dependencies = [
963-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
963+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
964964
"rustc-std-workspace-core 1.0.0",
965965
]
966966

@@ -1137,7 +1137,7 @@ name = "hashbrown"
11371137
version = "0.4.0"
11381138
source = "registry+https://github.com/rust-lang/crates.io-index"
11391139
dependencies = [
1140-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
1140+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
11411141
"rustc-std-workspace-alloc 1.0.0",
11421142
"rustc-std-workspace-core 1.0.0",
11431143
]
@@ -1955,7 +1955,7 @@ dependencies = [
19551955
name = "panic_abort"
19561956
version = "0.0.0"
19571957
dependencies = [
1958-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
1958+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
19591959
"core 0.0.0",
19601960
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
19611961
]
@@ -1966,7 +1966,7 @@ version = "0.0.0"
19661966
dependencies = [
19671967
"alloc 0.0.0",
19681968
"cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
1969-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
1969+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
19701970
"core 0.0.0",
19711971
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
19721972
"unwind 0.0.0",
@@ -2137,7 +2137,7 @@ name = "profiler_builtins"
21372137
version = "0.0.0"
21382138
dependencies = [
21392139
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
2140-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
2140+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
21412141
"core 0.0.0",
21422142
]
21432143

@@ -2674,7 +2674,7 @@ name = "rustc-demangle"
26742674
version = "0.1.15"
26752675
source = "registry+https://github.com/rust-lang/crates.io-index"
26762676
dependencies = [
2677-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
2677+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
26782678
"rustc-std-workspace-core 1.0.0",
26792679
]
26802680

@@ -2751,20 +2751,6 @@ dependencies = [
27512751
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
27522752
]
27532753

2754-
[[package]]
2755-
name = "rustc_allocator"
2756-
version = "0.0.0"
2757-
dependencies = [
2758-
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
2759-
"rustc 0.0.0",
2760-
"rustc_data_structures 0.0.0",
2761-
"rustc_errors 0.0.0",
2762-
"rustc_target 0.0.0",
2763-
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
2764-
"syntax 0.0.0",
2765-
"syntax_pos 0.0.0",
2766-
]
2767-
27682754
[[package]]
27692755
name = "rustc_apfloat"
27702756
version = "0.0.0"
@@ -2780,7 +2766,7 @@ dependencies = [
27802766
"alloc 0.0.0",
27812767
"build_helper 0.1.0",
27822768
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
2783-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
2769+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
27842770
"core 0.0.0",
27852771
]
27862772

@@ -2822,7 +2808,6 @@ dependencies = [
28222808
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
28232809
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
28242810
"rustc 0.0.0",
2825-
"rustc_allocator 0.0.0",
28262811
"rustc_apfloat 0.0.0",
28272812
"rustc_codegen_utils 0.0.0",
28282813
"rustc_data_structures 0.0.0",
@@ -2883,7 +2868,6 @@ dependencies = [
28832868
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
28842869
"rustc 0.0.0",
28852870
"rustc-rayon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
2886-
"rustc_allocator 0.0.0",
28872871
"rustc_ast_borrowck 0.0.0",
28882872
"rustc_codegen_utils 0.0.0",
28892873
"rustc_data_structures 0.0.0",
@@ -2904,7 +2888,6 @@ dependencies = [
29042888
"serialize 0.0.0",
29052889
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
29062890
"syntax 0.0.0",
2907-
"syntax_ext 0.0.0",
29082891
"syntax_pos 0.0.0",
29092892
]
29102893

@@ -2948,7 +2931,6 @@ dependencies = [
29482931
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
29492932
"rustc 0.0.0",
29502933
"rustc-rayon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
2951-
"rustc_allocator 0.0.0",
29522934
"rustc_ast_borrowck 0.0.0",
29532935
"rustc_codegen_ssa 0.0.0",
29542936
"rustc_codegen_utils 0.0.0",
@@ -3006,7 +2988,7 @@ dependencies = [
30062988
"alloc 0.0.0",
30072989
"build_helper 0.1.0",
30082990
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
3009-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
2991+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
30102992
"core 0.0.0",
30112993
]
30122994

@@ -3069,7 +3051,7 @@ dependencies = [
30693051
"alloc 0.0.0",
30703052
"build_helper 0.1.0",
30713053
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
3072-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
3054+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
30733055
"core 0.0.0",
30743056
]
30753057

@@ -3187,7 +3169,7 @@ dependencies = [
31873169
"alloc 0.0.0",
31883170
"build_helper 0.1.0",
31893171
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
3190-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
3172+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
31913173
"core 0.0.0",
31923174
]
31933175

@@ -3494,7 +3476,7 @@ dependencies = [
34943476
"backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
34953477
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
34963478
"cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
3497-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
3479+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
34983480
"core 0.0.0",
34993481
"dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
35003482
"fortanix-sgx-abi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4121,7 +4103,7 @@ version = "0.0.0"
41214103
dependencies = [
41224104
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
41234105
"cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
4124-
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
4106+
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
41254107
"core 0.0.0",
41264108
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
41274109
]
@@ -4335,7 +4317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
43354317
"checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
43364318
"checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
43374319
"checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
4338-
"checksum compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "ad9b4731b9e701aefe9e6bd1e9173f30526661508f9aaadaa5caec25ddf95585"
4320+
"checksum compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "ef1c086a06d6f52f9c0d50cacdc021bfb6034ddeec9fb7e62f099f13f65472f4"
43394321
"checksum compiletest_rs 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "f40ecc9332b68270998995c00f8051ee856121764a0d3230e64c9efd059d27b6"
43404322
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
43414323
"checksum core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e2640d6d0bf22e82bed1b73c6aef8d5dd31e5abe6666c57e6d45e2649f4f887"

‎src/bootstrap/sanity.rs‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,11 @@ pub fn check(build: &mut Build) {
7878

7979
// We need cmake, but only if we're actually building LLVM or sanitizers.
8080
let building_llvm = build.hosts.iter()
81-
.filter_map(|host| build.config.target_config.get(host))
82-
.any(|config| config.llvm_config.is_none());
81+
.map(|host| build.config.target_config
82+
.get(host)
83+
.map(|config| config.llvm_config.is_none())
84+
.unwrap_or(true))
85+
.any(|build_llvm_ourselves| build_llvm_ourselves);
8386
if building_llvm || build.config.sanitizers {
8487
cmd_finder.must_have("cmake");
8588
}
@@ -106,6 +109,14 @@ pub fn check(build: &mut Build) {
106109
build.config.ninja = true;
107110
}
108111
}
112+
113+
if build.config.lldb_enabled {
114+
cmd_finder.must_have("swig");
115+
let out = output(Command::new("swig").arg("-version"));
116+
if !out.contains("SWIG Version 3") && !out.contains("SWIG Version 4") {
117+
panic!("Ensure that Swig 3.x.x or 4.x.x is installed.");
118+
}
119+
}
109120
}
110121

111122
build.config.python = build.config.python.take().map(|p| cmd_finder.must_have(p))

‎src/doc/rustdoc/src/unstable-features.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,8 @@ Book][unstable-masked] and [its tracking issue][issue-masked].
183183

184184
As designed in [RFC 1990], Rustdoc can read an external file to use as a type's documentation. This
185185
is useful if certain documentation is so long that it would break the flow of reading the source.
186-
Instead of writing it all inline, writing `#[doc(include = "sometype.md")]` (where `sometype.md` is
187-
a file adjacent to the `lib.rs` for the crate) will ask Rustdoc to instead read that file and use it
188-
as if it were written inline.
186+
Instead of writing it all inline, writing `#[doc(include = "sometype.md")]` will ask Rustdoc to
187+
instead read that file and use it as if it were written inline.
189188

190189
[RFC 1990]: https://github.com/rust-lang/rfcs/pull/1990
191190

0 commit comments

Comments
 (0)