Skip to content

Commit b127458

Browse files
committed
update rustc-std-workspace crates
- make rustc-std-workspace-core/alloc re-exports of their underlying crates, like std = cleanup manifests
1 parent 5c6f27b commit b127458

File tree

9 files changed

+40
-12
lines changed

9 files changed

+40
-12
lines changed

Cargo.lock

+12
Original file line numberDiff line numberDiff line change
@@ -3196,6 +3196,18 @@ version = "0.1.0"
31963196
source = "registry+https://github.com/rust-lang/crates.io-index"
31973197
checksum = "e5c9f15eec8235d7cb775ee6f81891db79b98fd54ba1ad8fae565b88ef1ae4e2"
31983198

3199+
[[package]]
3200+
name = "rustc-std-workspace-alloc"
3201+
version = "1.0.1"
3202+
3203+
[[package]]
3204+
name = "rustc-std-workspace-core"
3205+
version = "1.0.1"
3206+
3207+
[[package]]
3208+
name = "rustc-std-workspace-std"
3209+
version = "1.0.1"
3210+
31993211
[[package]]
32003212
name = "rustc_abi"
32013213
version = "0.0.0"

Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ resolver = "2"
33
members = [
44
"compiler/rustc",
55
"src/etc/test-float-parse",
6+
"src/rustc-std-workspace/rustc-std-workspace-core",
7+
"src/rustc-std-workspace/rustc-std-workspace-alloc",
8+
"src/rustc-std-workspace/rustc-std-workspace-std",
69
"src/rustdoc-json-types",
710
"src/tools/build_helper",
811
"src/tools/cargotest",

library/rustc-std-workspace-core/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ it'll look like
2727

2828
when Cargo invokes the compiler, satisfying the implicit `extern crate core`
2929
directive injected by the compiler.
30+
31+
The sources for the crates.io version can be found in
32+
[`src/rustc-std-workspace`](../../src/rustc-std-workspace).

src/rustc-std-workspace/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
See `library/rustc-std-workspace-core/README.md` for context.
1+
See [`library/rustc-std-workspace-core/README.md`](../../library/rustc-std-workspace-core/README.md) for context.
22

33
These are the crates.io versions of these crates, as opposed to the versions
44
in `library` which are the ones used inside the rustc workspace.
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
[package]
22
name = "rustc-std-workspace-alloc"
3-
version = "1.0.0"
3+
version = "1.0.1"
44
authors = ["Alex Crichton <[email protected]>"]
5-
edition = "2018"
5+
edition = "2021"
66
license = 'MIT/Apache-2.0'
7-
description = 'workspace hack'
7+
description = """
8+
crate for integration of crates.io crates into rust-lang/rust standard library workspace
9+
"""
810

9-
[dependencies]
11+
repository = "https://github.com/rust-lang/rust/tree/master/src/rustc-std-workspace"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#![no_std]
2+
extern crate alloc as the_alloc;
3+
pub use the_alloc::*;
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
[package]
22
name = "rustc-std-workspace-core"
3-
version = "1.0.0"
3+
version = "1.0.1"
44
authors = ["Alex Crichton <[email protected]>"]
5+
edition = "2021"
56
license = "MIT/Apache-2.0"
67
description = """
7-
Explicitly empty crate for rust-lang/rust integration
8+
crate for integration of crates.io crates into rust-lang/rust standard library workspace
89
"""
910

10-
[dependencies]
11+
repository = "https://github.com/rust-lang/rust/tree/master/src/rustc-std-workspace"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#![no_std]
2+
extern crate core as the_core;
3+
pub use the_core::*;

src/rustc-std-workspace/rustc-std-workspace-std/Cargo.toml

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
name = "rustc-std-workspace-std"
33
version = "1.0.1"
44
authors = ["Alex Crichton <[email protected]>"]
5+
edition = "2021"
56
license = "MIT/Apache-2.0"
6-
description = "Workaround for rustbuild"
7-
8-
[lib]
9-
name = "std"
7+
description = """
8+
crate for integration of crates.io crates into rust-lang/rust standard library workspace
9+
"""
1010

11+
repository = "https://github.com/rust-lang/rust/tree/master/src/rustc-std-workspace"

0 commit comments

Comments
 (0)