update rustc-std-workspace crates

- make rustc-std-workspace-core/alloc re-exports of their underlying crates, like std
= cleanup manifests
This commit is contained in:
Ralf Jung 2024-11-03 22:30:16 +01:00
parent 5c6f27b1e0
commit b12745863e
9 changed files with 40 additions and 12 deletions

View File

@ -3196,6 +3196,18 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5c9f15eec8235d7cb775ee6f81891db79b98fd54ba1ad8fae565b88ef1ae4e2" checksum = "e5c9f15eec8235d7cb775ee6f81891db79b98fd54ba1ad8fae565b88ef1ae4e2"
[[package]]
name = "rustc-std-workspace-alloc"
version = "1.0.1"
[[package]]
name = "rustc-std-workspace-core"
version = "1.0.1"
[[package]]
name = "rustc-std-workspace-std"
version = "1.0.1"
[[package]] [[package]]
name = "rustc_abi" name = "rustc_abi"
version = "0.0.0" version = "0.0.0"

View File

@ -3,6 +3,9 @@ resolver = "2"
members = [ members = [
"compiler/rustc", "compiler/rustc",
"src/etc/test-float-parse", "src/etc/test-float-parse",
"src/rustc-std-workspace/rustc-std-workspace-core",
"src/rustc-std-workspace/rustc-std-workspace-alloc",
"src/rustc-std-workspace/rustc-std-workspace-std",
"src/rustdoc-json-types", "src/rustdoc-json-types",
"src/tools/build_helper", "src/tools/build_helper",
"src/tools/cargotest", "src/tools/cargotest",

View File

@ -27,3 +27,6 @@ it'll look like
when Cargo invokes the compiler, satisfying the implicit `extern crate core` when Cargo invokes the compiler, satisfying the implicit `extern crate core`
directive injected by the compiler. directive injected by the compiler.
The sources for the crates.io version can be found in
[`src/rustc-std-workspace`](../../src/rustc-std-workspace).

View File

@ -1,4 +1,4 @@
See `library/rustc-std-workspace-core/README.md` for context. 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 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. in `library` which are the ones used inside the rustc workspace.

View File

@ -1,9 +1,11 @@
[package] [package]
name = "rustc-std-workspace-alloc" name = "rustc-std-workspace-alloc"
version = "1.0.0" version = "1.0.1"
authors = ["Alex Crichton <alex@alexcrichton.com>"] authors = ["Alex Crichton <alex@alexcrichton.com>"]
edition = "2018" edition = "2021"
license = 'MIT/Apache-2.0' license = 'MIT/Apache-2.0'
description = 'workspace hack' description = """
crate for integration of crates.io crates into rust-lang/rust standard library workspace
"""
[dependencies] repository = "https://github.com/rust-lang/rust/tree/master/src/rustc-std-workspace"

View File

@ -0,0 +1,3 @@
#![no_std]
extern crate alloc as the_alloc;
pub use the_alloc::*;

View File

@ -1,10 +1,11 @@
[package] [package]
name = "rustc-std-workspace-core" name = "rustc-std-workspace-core"
version = "1.0.0" version = "1.0.1"
authors = ["Alex Crichton <alex@alexcrichton.com>"] authors = ["Alex Crichton <alex@alexcrichton.com>"]
edition = "2021"
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
description = """ description = """
Explicitly empty crate for rust-lang/rust integration crate for integration of crates.io crates into rust-lang/rust standard library workspace
""" """
[dependencies] repository = "https://github.com/rust-lang/rust/tree/master/src/rustc-std-workspace"

View File

@ -0,0 +1,3 @@
#![no_std]
extern crate core as the_core;
pub use the_core::*;

View File

@ -2,9 +2,10 @@
name = "rustc-std-workspace-std" name = "rustc-std-workspace-std"
version = "1.0.1" version = "1.0.1"
authors = ["Alex Crichton <alex@alexcrichton.com>"] authors = ["Alex Crichton <alex@alexcrichton.com>"]
edition = "2021"
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
description = "Workaround for rustbuild" description = """
crate for integration of crates.io crates into rust-lang/rust standard library workspace
[lib] """
name = "std"
repository = "https://github.com/rust-lang/rust/tree/master/src/rustc-std-workspace"