Skip to content

Commit 0b8ba15

Browse files
committed
Auto merge of #161188 - JonathanBrouwer:rollup-9nQRlyV, r=JonathanBrouwer
Rollup of 17 pull requests Successful merges: - #160529 (Upgrade and deduplicate dependencies) - #161017 (Library: enforce clippy deref lints in CI) - #160416 (std: fix unix socket address truncation without a trailing NUL) - #161006 ([CI] Build newer `binutils` before building `gcc`) - #161141 (Add documentation for BPF targets) - #161157 (bootstrap: Move several items out of the crate root) - #161185 (std: guard against unwinds in queue-based `Once`) - #161186 (miri subtree update) - #159855 (std: retry waitid on EINTR in the pidfd wait path) - #161053 (Add regression test for borrow of array drop type in const) - #161073 (Add regression test for path printing with infinitely many visible names) - #161099 (Add regression test for unstable def_ident_span fingerprint with incremental recompilation) - #161103 (cleanup: rip out unnecessary `iter().last()` and `iter().next()`) - #161136 (Add BPF test for Rust ABI stack arguments) - #161146 (Switch to c8a EC2 runner for auto merges) - #161148 ([rustdoc] Put back one removed flaky GUI test (which hopefully isn't flaky anymore)) - #161181 (Add back flaky gui rustdoc test `tests/rustdoc-gui/headers-color.goml`)
2 parents bf063f1 + 9a80de0 commit 0b8ba15

143 files changed

Lines changed: 1516 additions & 740 deletions

File tree

Some content is hidden

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

‎Cargo.lock‎

Lines changed: 47 additions & 250 deletions
Large diffs are not rendered by default.

‎compiler/rustc_ast_passes/src/ast_validation.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ impl<'a> AstValidator<'a> {
11801180
self.dcx().emit_err(diagnostics::ArgsBeforeConstraint {
11811181
arg_spans: arg_spans.clone(),
11821182
constraints: constraint_spans[0],
1183-
args: *arg_spans.iter().last().unwrap(),
1183+
args: *arg_spans.last().unwrap(),
11841184
data: data.span,
11851185
constraint_spans: diagnostics::EmptyLabelManySpans(constraint_spans),
11861186
arg_spans2: diagnostics::EmptyLabelManySpans(arg_spans),

‎compiler/rustc_codegen_gcc/Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ dependencies = [
145145

146146
[[package]]
147147
name = "object"
148-
version = "0.37.1"
148+
version = "0.39.1"
149149
source = "registry+https://github.com/rust-lang/crates.io-index"
150-
checksum = "03fd943161069e1768b4b3d050890ba48730e590f57e56d4aa04e7e090e61b4a"
150+
checksum = "2e5a6c098c7a3b6547378093f5cc30bc54fd361ce711e05293a5cc589562739b"
151151
dependencies = [
152152
"memchr",
153153
]

‎compiler/rustc_codegen_gcc/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ master = ["gccjit/master"]
1818
default = ["master"]
1919

2020
[dependencies]
21-
object = { version = "0.37.0", default-features = false, features = ["std", "read"] }
21+
object = { version = "0.39.0", default-features = false, features = ["std", "read"] }
2222
tempfile = "3.20"
2323
gccjit = { version = "3.3.0", features = ["dlopen"] }
2424
#gccjit = { git = "https://github.com/rust-lang/gccjit.rs", branch = "error-dlopen", features = ["dlopen"] }

‎compiler/rustc_codegen_llvm/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ test = false
1111
bitflags = "2.4.1"
1212
# To avoid duplicate dependencies, this should match the version of gimli used
1313
# by `rustc_codegen_ssa` via its `thorin-dwp` dependency.
14-
gimli = "0.33"
14+
gimli = "0.34"
1515
itertools = "0.15"
1616
libc = "0.2"
1717
libloading = { version = "0.9.0" }
1818
measureme = "12.0.1"
19-
object = { version = "0.38.1", default-features = false, features = ["std", "read"] }
19+
object = { version = "0.39.1", default-features = false, features = ["std", "read"] }
2020
rustc-demangle = "0.1.28"
2121
rustc_abi = { path = "../rustc_abi" }
2222
rustc_ast = { path = "../rustc_ast" }

‎compiler/rustc_codegen_ssa/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ rustc_trait_selection = { path = "../rustc_trait_selection" }
3838
serde_json = "1.0.59"
3939
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
4040
tempfile = "3.2"
41-
thorin-dwp = "0.10"
41+
thorin-dwp = "0.11"
4242
tracing = "0.1"
43-
wasm-encoder = "0.219"
43+
wasm-encoder = "0.247"
4444
# tidy-alphabetical-end
4545

4646
[target.'cfg(unix)'.dependencies]
@@ -49,7 +49,7 @@ libc = "0.2.50"
4949
# tidy-alphabetical-end
5050

5151
[dependencies.object]
52-
version = "0.38.1"
52+
version = "0.39.1"
5353
default-features = false
5454
features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"]
5555

‎compiler/rustc_codegen_ssa/src/back/link/raw_dylib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -477,13 +477,13 @@ fn create_elf_raw_dylib_stub(sess: &Session, soname: &str, symbols: &[DllImport]
477477
// the DT_SONAME will be used by the linker to populate DT_NEEDED
478478
// which the loader uses to find the library.
479479
stub.write_align_dynamic();
480-
stub.write_dynamic_string(elf::DT_SONAME, soname);
480+
stub.write_dynamic_string(elf::DT_SONAME, soname).unwrap();
481481
// LSB section "2.7. Symbol Versioning" requires `DT_VERDEFNUM` to be reliable.
482482
if verdef_count > 1 {
483-
stub.write_dynamic(elf::DT_VERDEFNUM, verdef_count as u64);
483+
stub.write_dynamic(elf::DT_VERDEFNUM, verdef_count as u64).unwrap();
484484
}
485485
// DT_NULL terminates the .dynamic table.
486-
stub.write_dynamic(elf::DT_NULL, 0);
486+
stub.write_dynamic(elf::DT_NULL, 0).unwrap();
487487

488488
stub_buf
489489
}

‎compiler/rustc_hir_typeck/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ fn extend_err_with_const_context(
324324
{
325325
// `foo<N>()`, point at the const parameter in the definition of `foo`.
326326
if let Some(i) =
327-
path.segments.iter().last().and_then(|segment| segment.args).and_then(|args| {
327+
path.segments.last().and_then(|segment| segment.args).and_then(|args| {
328328
args.args.iter().position(|arg| {
329329
matches!(arg, hir::GenericArg::Const(arg) if arg.hir_id == parent.hir_id)
330330
})

‎compiler/rustc_metadata/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2024"
66
[dependencies]
77
# tidy-alphabetical-start
88
bitflags = "2.4.1"
9-
libloading = "0.8.0"
9+
libloading = "0.9.0"
1010
odht = { version = "0.3.1", features = ["nightly"] }
1111
rustc_abi = { path = "../rustc_abi" }
1212
rustc_ast = { path = "../rustc_ast" }

‎compiler/rustc_metadata/src/host_dylib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fn attempt_load_dylib(path: &Path) -> Result<libloading::Library, libloading::Er
3333
.map(|lib| lib.into());
3434
}
3535

36-
unsafe { libloading::Library::new(&path) }
36+
unsafe { libloading::Library::new(path) }
3737
}
3838

3939
// On Windows the compiler would sometimes intermittently fail to open the

0 commit comments

Comments
 (0)