diff options
| author | bors <bors@rust-lang.org> | 2024-11-04 17:39:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-04 17:39:34 +0000 |
| commit | 82c24eccadc216cac4365ce83ac6a36ef72ff1a3 (patch) | |
| tree | 0788c16493dc1a71ea5277855be55abb0eaf06af /src | |
| parent | 432972cae64d736b892e7a4c8b4fe7fe0e888904 (diff) | |
| parent | a4f323ce9c00a1a51eae998c373103e23b622a7a (diff) | |
Auto merge of #132603 - matthiaskrgr:rollup-ikzofgc, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #132355 (Fix compiler panic with a large number of threads) - #132486 (No need to instantiate binder in `confirm_async_closure_candidate`) - #132544 (Use backticks instead of single quotes for library feature names in diagnostics) - #132559 (find the generic container rather than simply looking up for the assoc with const arg) - #132579 (add rustc std workspace crate sources) - #132583 (Suggest creating unary tuples when types don't match a trait) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
7 files changed, 44 insertions, 0 deletions
diff --git a/src/rustc-std-workspace/README.md b/src/rustc-std-workspace/README.md new file mode 100644 index 00000000000..a8e925f243d --- /dev/null +++ b/src/rustc-std-workspace/README.md @@ -0,0 +1,4 @@ +See [`library/rustc-std-workspace-core/README.md`](../../library/rustc-std-workspace-core/README.md) for context. + +These are the crates.io versions of these crates, as opposed to the versions +in `library` which are the ones used inside the rustc workspace. diff --git a/src/rustc-std-workspace/rustc-std-workspace-alloc/Cargo.toml b/src/rustc-std-workspace/rustc-std-workspace-alloc/Cargo.toml new file mode 100644 index 00000000000..1a8ebdcfeae --- /dev/null +++ b/src/rustc-std-workspace/rustc-std-workspace-alloc/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "rustc-std-workspace-alloc" +version = "1.0.1" +authors = ["Alex Crichton <alex@alexcrichton.com>"] +edition = "2021" +license = 'MIT/Apache-2.0' +description = """ +crate for integration of crates.io crates into rust-lang/rust standard library workspace +""" + +repository = "https://github.com/rust-lang/rust/tree/master/src/rustc-std-workspace" diff --git a/src/rustc-std-workspace/rustc-std-workspace-alloc/src/lib.rs b/src/rustc-std-workspace/rustc-std-workspace-alloc/src/lib.rs new file mode 100644 index 00000000000..938b8bb29b6 --- /dev/null +++ b/src/rustc-std-workspace/rustc-std-workspace-alloc/src/lib.rs @@ -0,0 +1,3 @@ +#![no_std] +extern crate alloc as the_alloc; +pub use the_alloc::*; diff --git a/src/rustc-std-workspace/rustc-std-workspace-core/Cargo.toml b/src/rustc-std-workspace/rustc-std-workspace-core/Cargo.toml new file mode 100644 index 00000000000..116cf3fb6bc --- /dev/null +++ b/src/rustc-std-workspace/rustc-std-workspace-core/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "rustc-std-workspace-core" +version = "1.0.1" +authors = ["Alex Crichton <alex@alexcrichton.com>"] +edition = "2021" +license = "MIT/Apache-2.0" +description = """ +crate for integration of crates.io crates into rust-lang/rust standard library workspace +""" + +repository = "https://github.com/rust-lang/rust/tree/master/src/rustc-std-workspace" diff --git a/src/rustc-std-workspace/rustc-std-workspace-core/src/lib.rs b/src/rustc-std-workspace/rustc-std-workspace-core/src/lib.rs new file mode 100644 index 00000000000..38b1615a024 --- /dev/null +++ b/src/rustc-std-workspace/rustc-std-workspace-core/src/lib.rs @@ -0,0 +1,3 @@ +#![no_std] +extern crate core as the_core; +pub use the_core::*; diff --git a/src/rustc-std-workspace/rustc-std-workspace-std/Cargo.toml b/src/rustc-std-workspace/rustc-std-workspace-std/Cargo.toml new file mode 100644 index 00000000000..fcd1ca3deaf --- /dev/null +++ b/src/rustc-std-workspace/rustc-std-workspace-std/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "rustc-std-workspace-std" +version = "1.0.1" +authors = ["Alex Crichton <alex@alexcrichton.com>"] +edition = "2021" +license = "MIT/Apache-2.0" +description = """ +crate for integration of crates.io crates into rust-lang/rust standard library workspace +""" + +repository = "https://github.com/rust-lang/rust/tree/master/src/rustc-std-workspace" diff --git a/src/rustc-std-workspace/rustc-std-workspace-std/src/lib.rs b/src/rustc-std-workspace/rustc-std-workspace-std/src/lib.rs new file mode 100644 index 00000000000..f40d09cafbb --- /dev/null +++ b/src/rustc-std-workspace/rustc-std-workspace-std/src/lib.rs @@ -0,0 +1 @@ +pub use std::*; |
