From 1baa306070a555ef695002edfd94bca73b23bd8b Mon Sep 17 00:00:00 2001 From: Hanna Kruppe Date: Thu, 3 Oct 2024 15:37:59 +0200 Subject: [PATCH 1/2] Update to windows-sys v0.59 This is the first new version since v0.52. Since dlmalloc compiles and passes tests without any changes, I relaxed the version requirement to allow both versions. That should contribute a little to avoiding lockfiles with two windows-sys versions in them. Such duplication is pretty harmless in the case of dlmalloc (since it's rarely if ever built for windows by dependents), but at the very least it still trips up tools like cargo-deny that scan the lockfile. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 66abd58..5c5b3bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ compiler_builtins = { version = '0.1.0', optional = true } cfg-if = "1.0" [target.'cfg(target_os = "windows")'.dependencies.windows-sys] -version = "0.52.0" +version = ">=0.52.0, <=0.59.*" features = [ "Win32_Foundation", "Win32_System_Memory", From e423c12256f9a5d5c8eb28496ad22a1e38e87c8e Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 3 Oct 2024 10:14:15 -0700 Subject: [PATCH 2/2] Fix testing on beta/nightly Rust --- .github/workflows/main.yml | 11 +++++++++++ build.rs | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 build.rs diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 41f9e18..2c7a782 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,11 +44,22 @@ jobs: - run: cargo test --features debug - run: cargo test --features global - run: cargo test --release + env: + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS: true + - run: cargo test --release + env: + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS: false - run: cargo test --features debug --release + env: + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS: true - run: RUSTFLAGS='--cfg test_lots' cargo test --release shell: bash + env: + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS: true - run: RUSTFLAGS='--cfg test_lots' cargo test --release --features debug shell: bash + env: + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS: true rustfmt: name: Rustfmt diff --git a/build.rs b/build.rs deleted file mode 100644 index 20aaa4f..0000000 --- a/build.rs +++ /dev/null @@ -1,4 +0,0 @@ -fn main() { - #[cfg(feature = "debug")] - println!("cargo:rustc-cfg=debug_assertions"); -}