about summary refs log tree commit diff
path: root/Cargo.lock
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-04-05 18:54:05 +0000
committerbors <bors@rust-lang.org>2025-04-05 18:54:05 +0000
commit5e17a2a91dd7dbefd8b4a1087c2e42257457deeb (patch)
tree313978663fd68c1fb16d9422c26334555aae6f02 /Cargo.lock
parent0c478fdfe138a8b09744798c85fe2be657768b00 (diff)
parent91377bd4caf96efff28c8ae5844d47904f642d1d (diff)
downloadrust-5e17a2a91dd7dbefd8b4a1087c2e42257457deeb.tar.gz
rust-5e17a2a91dd7dbefd8b4a1087c2e42257457deeb.zip
Auto merge of #139417 - matthiaskrgr:rollup-ktf1d6s, r=matthiaskrgr
Rollup of 5 pull requests

Successful merges:

 - #136877 (Fix missing const for inherent pointer `replace` methods)
 - #138797 (Fix `ProvenVia` for global where clauses)
 - #139121 (Rename internal module from `statik` to `no_threads`)
 - #139319 (StableMIR: Prepare for refactoring)
 - #139404 (Small smir cleanup)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'Cargo.lock')
-rw-r--r--Cargo.lock5
1 files changed, 2 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 96526f7e9e7..99bd1bff020 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4432,7 +4432,7 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "scoped-tls",
- "stable_mir",
+ "serde",
  "tracing",
 ]
 
@@ -4990,8 +4990,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 name = "stable_mir"
 version = "0.1.0-preview"
 dependencies = [
- "scoped-tls",
- "serde",
+ "rustc_smir",
 ]
 
 [[package]]