Skip to content

Commit

Permalink
update rustc-std-workspace crates
Browse files Browse the repository at this point in the history
- make rustc-std-workspace-core/alloc re-exports of their underlying crates, like std
= cleanup manifests
  • Loading branch information
RalfJung committed Nov 4, 2024
1 parent 5c6f27b commit b127458
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 12 deletions.
12 changes: 12 additions & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3196,6 +3196,18 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
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]]
name = "rustc_abi"
version = "0.0.0"
Expand Down
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ resolver = "2"
members = [
"compiler/rustc",
"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/tools/build_helper",
"src/tools/cargotest",
Expand Down
3 changes: 3 additions & 0 deletions library/rustc-std-workspace-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ it'll look like

when Cargo invokes the compiler, satisfying the implicit `extern crate core`
directive injected by the compiler.

The sources for the crates.io version can be found in
[`src/rustc-std-workspace`](../../src/rustc-std-workspace).
2 changes: 1 addition & 1 deletion src/rustc-std-workspace/README.md
Original file line number Diff line number Diff line change
@@ -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
in `library` which are the ones used inside the rustc workspace.
10 changes: 6 additions & 4 deletions src/rustc-std-workspace/rustc-std-workspace-alloc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
[package]
name = "rustc-std-workspace-alloc"
version = "1.0.0"
version = "1.0.1"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
edition = "2018"
edition = "2021"
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"
3 changes: 3 additions & 0 deletions src/rustc-std-workspace/rustc-std-workspace-alloc/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#![no_std]
extern crate alloc as the_alloc;
pub use the_alloc::*;
7 changes: 4 additions & 3 deletions src/rustc-std-workspace/rustc-std-workspace-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[package]
name = "rustc-std-workspace-core"
version = "1.0.0"
version = "1.0.1"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
edition = "2021"
license = "MIT/Apache-2.0"
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"
3 changes: 3 additions & 0 deletions src/rustc-std-workspace/rustc-std-workspace-core/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#![no_std]
extern crate core as the_core;
pub use the_core::*;
9 changes: 5 additions & 4 deletions src/rustc-std-workspace/rustc-std-workspace-std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
name = "rustc-std-workspace-std"
version = "1.0.1"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
edition = "2021"
license = "MIT/Apache-2.0"
description = "Workaround for rustbuild"

[lib]
name = "std"
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"

0 comments on commit b127458

Please sign in to comment.