Skip to content

Commit 5cbb339

Browse files
committed
Merge workspace config
1 parent 6842639 commit 5cbb339

File tree

7 files changed

+40
-50
lines changed

7 files changed

+40
-50
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "musl"]
2-
path = libm/crates/musl-math-sys/musl
2+
path = crates/musl-math-sys/musl
33
url = https://git.musl-libc.org/git/musl
44
shallow = true

Cargo.libm.toml

Lines changed: 0 additions & 37 deletions
This file was deleted.

Cargo.toml

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,42 @@ members = [
77
"builtins-test",
88
"builtins-test-intrinsics",
99
"compiler-builtins",
10+
"crates/libm-macros",
11+
"crates/musl-math-sys",
12+
"crates/util",
13+
"libm",
14+
"libm-test",
1015
]
1116

1217
default-members = [
13-
"compiler-builtins",
1418
"builtins-test",
19+
"compiler-builtins",
20+
"crates/libm-macros",
21+
"libm",
22+
"libm-test"
1523
]
1624

17-
[profile.release]
18-
panic = 'abort'
25+
# [profile.release]
26+
# panic = 'abort'
27+
28+
# [profile.dev]
29+
# panic = 'abort'
30+
31+
# The default release profile is unchanged.
32+
33+
# Release mode with debug assertions
34+
[profile.release-checked]
35+
inherits = "release"
36+
debug-assertions = true
37+
overflow-checks = true
38+
39+
# Release with maximum optimizations, which is very slow to build. This is also
40+
# what is needed to check `no-panic`.
41+
[profile.release-opt]
42+
inherits = "release"
43+
codegen-units = 1
44+
lto = "fat"
1945

20-
[profile.dev]
21-
panic = 'abort'
46+
[profile.bench]
47+
# Required for iai-callgrind
48+
debug = true

compiler-builtins/src/math.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#[allow(dead_code)]
33
#[allow(unused_imports)]
44
#[allow(clippy::all)]
5-
#[path = "../../libm/libm/src/math/mod.rs"]
5+
#[path = "../../libm/src/math/mod.rs"]
66
pub(crate) mod libm;
77

88
macro_rules! libm_intrinsics {

crates/util/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ unstable-float = ["libm/unstable-float", "libm-test/unstable-float", "rug?/night
1313
[dependencies]
1414
libm = { path = "../../libm", default-features = false }
1515
libm-macros = { path = "../libm-macros" }
16-
libm-test = { path = "../libm-test", default-features = false }
16+
libm-test = { path = "../../libm-test", default-features = false }
1717
musl-math-sys = { path = "../musl-math-sys", optional = true }
1818
rug = { version = "1.27.0", optional = true, default-features = false, features = ["float", "std"] }

libm-test/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ anyhow = "1.0.97"
3232
gmp-mpfr-sys = { version = "1.6.4", optional = true, default-features = false }
3333
iai-callgrind = { version = "0.14.0", optional = true }
3434
indicatif = { version = "0.17.11", default-features = false }
35-
libm = { path = "../../libm", features = ["unstable-public-internals"] }
36-
libm-macros = { path = "../libm-macros" }
37-
musl-math-sys = { path = "../musl-math-sys", optional = true }
35+
libm = { path = "../libm", features = ["unstable-public-internals"] }
36+
libm-macros = { path = "../crates/libm-macros" }
37+
musl-math-sys = { path = "../crates/musl-math-sys", optional = true }
3838
paste = "1.0.15"
3939
rand = "0.9.0"
4040
rand_chacha = "0.9.0"

libm-test/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#[path = "../../libm/configure.rs"]
1+
#[path = "../libm/configure.rs"]
22
mod configure;
33
use configure::Config;
44

55
fn main() {
6-
println!("cargo:rerun-if-changed=../../libm/configure.rs");
6+
println!("cargo:rerun-if-changed=../libm/configure.rs");
77
let cfg = Config::from_env();
88
configure::emit_test_config(&cfg);
99
}

0 commit comments

Comments
 (0)