Skip to content

Commit d528b5e

Browse files
authored
Rollup merge of rust-lang#58829 - Xanewok:scoped-tls, r=Zoxc
librustc_interface: Update scoped-tls to 1.0 Done previously as a part of rust-lang#58748. r? @Zoxc
2 parents 935602a + 204f087 commit d528b5e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Cargo.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -2779,7 +2779,7 @@ dependencies = [
27792779
"rustc_resolve 0.0.0",
27802780
"rustc_traits 0.0.0",
27812781
"rustc_typeck 0.0.0",
2782-
"scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
2782+
"scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
27832783
"serialize 0.0.0",
27842784
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
27852785
"syntax 0.0.0",

src/librustc_interface/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ crate-type = ["dylib"]
1212
log = "0.4"
1313
rustc-rayon = "0.1.1"
1414
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }
15-
scoped-tls = { version = "0.1.1", features = ["nightly"] }
15+
scoped-tls = "1.0"
1616
syntax = { path = "../libsyntax" }
1717
syntax_ext = { path = "../libsyntax_ext" }
1818
syntax_pos = { path = "../libsyntax_pos" }

0 commit comments

Comments
 (0)