Skip to content

Commit

Permalink
Rollup merge of rust-lang#132579 - RalfJung:rustc-std-workspace-crate…
Browse files Browse the repository at this point in the history
…s, r=Amanieu

add rustc std workspace crate sources

This adds the sources for the crates listed at https://crates.io/search?q=rustc-std-workspace in this repo. The first commit adds the original sources as downloaded from crates.io (with `Cargo.toml.orig` moved back over `Cargo.toml`), and adds a README explaining what this is about. The 2nd commit updates the sources to make the core and alloc crates re-exports of the "actual" core and alloc crates, as was already the case with `std`, and also adds a `repository` link to the manifest so one can figure out where to find these crates.

I bumped the version for the core and alloc crates in the hope that the new versions can be published on crates.io shortly after this PR lands.

See [Zulip](https://rust-lang.zulipchat.com/#narrow/channel/219381-t-libs/topic/rustc-std-workspace-core.20crate.20is.20empty) for a bit more context.

r? `@Amanieu`
  • Loading branch information
matthiaskrgr authored Nov 4, 2024
2 parents 909574e + b127458 commit 46ae155
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 0 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).
4 changes: 4 additions & 0 deletions src/rustc-std-workspace/README.md
Original file line number Diff line number Diff line change
@@ -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.
11 changes: 11 additions & 0 deletions src/rustc-std-workspace/rustc-std-workspace-alloc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[package]
name = "rustc-std-workspace-alloc"
version = "1.0.1"
authors = ["Alex Crichton <[email protected]>"]
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"
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::*;
11 changes: 11 additions & 0 deletions src/rustc-std-workspace/rustc-std-workspace-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[package]
name = "rustc-std-workspace-core"
version = "1.0.1"
authors = ["Alex Crichton <[email protected]>"]
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"
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::*;
11 changes: 11 additions & 0 deletions src/rustc-std-workspace/rustc-std-workspace-std/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[package]
name = "rustc-std-workspace-std"
version = "1.0.1"
authors = ["Alex Crichton <[email protected]>"]
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"
1 change: 1 addition & 0 deletions src/rustc-std-workspace/rustc-std-workspace-std/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pub use std::*;

0 comments on commit 46ae155

Please sign in to comment.