Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.

Commit a9b32a3

Browse files
committed
Introduce a virtual manifest
Move the workspace configuration to a virtual manifest. This reorganization makes a more clear separation between package contents and support files that don't get distributed. It will also make it easier to merge this repository with `compiler-builtins`, which had a similar update done in [1], if that is done at some point. [1]: rust-lang/compiler-builtins#702
1 parent a4ec7b2 commit a9b32a3

File tree

2 files changed

+37
-38
lines changed

2 files changed

+37
-38
lines changed

Cargo.toml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[workspace]
2+
resolver = "2"
3+
members = [
4+
"libm",
5+
"crates/libm-macros",
6+
"crates/libm-test",
7+
"crates/musl-math-sys",
8+
"crates/util",
9+
]
10+
default-members = [
11+
"libm",
12+
"crates/libm-macros",
13+
"crates/libm-test"
14+
]
15+
exclude = [
16+
# Requires `panic = abort` so can't be a member of the workspace
17+
"crates/compiler-builtins-smoke-test",
18+
]
19+
20+
# The default release profile is unchanged.
21+
22+
# Release mode with debug assertions
23+
[profile.release-checked]
24+
inherits = "release"
25+
debug-assertions = true
26+
overflow-checks = true
27+
28+
# Release with maximum optimizations, which is very slow to build. This is also
29+
# what is needed to check `no-panic`.
30+
[profile.release-opt]
31+
inherits = "release"
32+
codegen-units = 1
33+
lto = "fat"
34+
35+
[profile.bench]
36+
# Required for iai-callgrind
37+
debug = true

libm/Cargo.toml

-38
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ readme = "README.md"
1010
repository = "https://github.com/rust-lang/libm"
1111
version = "0.2.11"
1212
edition = "2021"
13-
exclude = ["/ci/", "/.github/workflows/"]
1413
rust-version = "1.63"
1514

1615
[features]
@@ -40,24 +39,6 @@ unstable-float = []
4039
# hard float operations.
4140
force-soft-floats = []
4241

43-
[workspace]
44-
resolver = "2"
45-
members = [
46-
"crates/libm-macros",
47-
"crates/libm-test",
48-
"crates/musl-math-sys",
49-
"crates/util",
50-
]
51-
default-members = [
52-
".",
53-
"crates/libm-macros",
54-
"crates/libm-test",
55-
]
56-
exclude = [
57-
# Requires `panic = abort` so can't be a member of the workspace
58-
"crates/compiler-builtins-smoke-test",
59-
]
60-
6142
[dev-dependencies]
6243
no-panic = "0.1.35"
6344

@@ -66,22 +47,3 @@ unexpected_cfgs = { level = "warn", check-cfg = [
6647
# compiler-builtins sets this feature, but we use it in `libm`
6748
'cfg(feature, values("compiler-builtins"))',
6849
] }
69-
70-
# The default release profile is unchanged.
71-
72-
# Release mode with debug assertions
73-
[profile.release-checked]
74-
inherits = "release"
75-
debug-assertions = true
76-
overflow-checks = true
77-
78-
# Release with maximum optimizations, which is very slow to build. This is also
79-
# what is needed to check `no-panic`.
80-
[profile.release-opt]
81-
inherits = "release"
82-
codegen-units = 1
83-
lto = "fat"
84-
85-
[profile.bench]
86-
# Required for iai-callgrind
87-
debug = true

0 commit comments

Comments
 (0)