Skip to content

Commit d7fb2fd

Browse files
committed
Auto merge of #145978 - Zalathar:rollup-0dzk72g, r=Zalathar
Rollup of 9 pull requests Successful merges: - rust-lang/rust#143713 (Add a mailmap entry for gnzlbg) - rust-lang/rust#144275 (implement Sum and Product for Saturating(u*)) - rust-lang/rust#144354 (fix(std): Fix undefined reference to __my_thread_exit on QNX 8.0) - rust-lang/rust#145387 (Remove TmpLayout in layout_of_enum) - rust-lang/rust#145793 (std library: use execinfo library also on NetBSD.) - rust-lang/rust#145884 (Test `instrument-mcount` codegen) - rust-lang/rust#145947 (Add more to the `[workspace.dependencies]` section in the top-level `Cargo.toml`) - rust-lang/rust#145972 (fix `core::marker::Destruct` doc) - rust-lang/rust#145977 (tests: Ignore basic-stepping.rs on riscv64) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b760a16 + fcab758 commit d7fb2fd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

rustc_public/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ rustc_public_bridge = { path = "../rustc_public_bridge" }
1212
rustc_session = { path = "../rustc_session" }
1313
rustc_span = { path = "../rustc_span" }
1414
rustc_target = { path = "../rustc_target" }
15-
scoped-tls = "1.0"
15+
scoped-tls.workspace = true
1616
serde = { version = "1.0.125", features = [ "derive" ] }
1717
tracing.workspace = true
1818
# tidy-alphabetical-end

0 commit comments

Comments
 (0)