From e2fb9022e31606e402eebc91538bb4d008d76761 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Thu, 8 Aug 2024 23:47:47 -0700 Subject: [PATCH 01/15] Add feature flag to allow compiling non-32 bit --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 3ecb407f..1a5d85e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -168,6 +168,7 @@ rustls_tls = ["mysql/default-rustls"] # internal feature-like things jobs = ["flume"] +allow_non_32bit = [] [dev-dependencies] regex = "1" From 2d3d7ee60baf8e20646d236fdfa047c8f13b0851 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Fri, 9 Aug 2024 00:01:22 -0700 Subject: [PATCH 02/15] Allow compiling non-32bit with feature flag --- src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 9cc7f274..78d21a70 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -55,5 +55,5 @@ pub mod url; #[cfg(feature = "worleynoise")] pub mod worleynoise; -#[cfg(not(target_pointer_width = "32"))] -compile_error!("rust-g must be compiled for a 32-bit target"); +#[cfg(all(not(target_pointer_width = "32"), not(feature = "allow_non_32bit")))] +compile_error!("Compiling for non-32bit is not allowed without enabling the `allow_non_32bit` feature."); From 030b3a6af16a9044f9fc75a58534ffdb948c1e7e Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Fri, 9 Aug 2024 00:23:18 -0700 Subject: [PATCH 03/15] appease the travis gods --- src/lib.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 78d21a70..6a3f7c31 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -56,4 +56,6 @@ pub mod url; pub mod worleynoise; #[cfg(all(not(target_pointer_width = "32"), not(feature = "allow_non_32bit")))] -compile_error!("Compiling for non-32bit is not allowed without enabling the `allow_non_32bit` feature."); +compile_error!( + "Compiling for non-32bit is not allowed without enabling the `allow_non_32bit` feature." +); From d3c99731eac4e70ef6c69d8f671ed6ad1a6f77f7 Mon Sep 17 00:00:00 2001 From: ZeWaka Date: Thu, 22 Aug 2024 18:30:42 -0700 Subject: [PATCH 04/15] lol we do actually need to build the whole std rip --- .github/workflows/rust.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 83b9a4e3..7a750b55 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -14,8 +14,7 @@ jobs: - uses: dtolnay/rust-toolchain@nightly with: - targets: i686-pc-windows-msvc # Used for clippy, since it doesn't need to build the entire std - components: rustfmt, clippy, rust-src + targets: i686-pc-windows-msvc - uses: Swatinem/rust-cache@v2 @@ -52,7 +51,7 @@ jobs: sudo apt-get install libgcc-s1:i386 g++-multilib zlib1g-dev:i386 ./scripts/install_byond.sh - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@nightly with: targets: i686-unknown-linux-gnu From 38f5702fa25ff6feed01d96b79f1465bc75200bf Mon Sep 17 00:00:00 2001 From: ZeWaka Date: Thu, 22 Aug 2024 18:31:00 -0700 Subject: [PATCH 05/15] more modern byond version --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7a750b55..067183cd 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest env: BYOND_MAJOR: 515 - BYOND_MINOR: 1636 + BYOND_MINOR: 1642 PKG_CONFIG_ALLOW_CROSS: 1 steps: From fae477525c6fe998c6c90a29d50769cd6d545756 Mon Sep 17 00:00:00 2001 From: ZeWaka Date: Thu, 22 Aug 2024 18:54:39 -0700 Subject: [PATCH 06/15] try add clippy --- .github/workflows/rust.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 067183cd..da795d75 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -16,6 +16,11 @@ jobs: with: targets: i686-pc-windows-msvc + - uses: dtolnay/rust-toolchain@stable + with: + targets: x86_64-pc-windows-msvc + components: clippy + - uses: Swatinem/rust-cache@v2 - name: Clippy (all features) From 91fa8e231c6dcd0a9d4174b82329cb80101f576a Mon Sep 17 00:00:00 2001 From: ZeWaka Date: Thu, 22 Aug 2024 19:42:17 -0700 Subject: [PATCH 07/15] moment --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index da795d75..c69b0688 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -16,7 +16,7 @@ jobs: with: targets: i686-pc-windows-msvc - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@nightly with: targets: x86_64-pc-windows-msvc components: clippy From 838016922fb57c57558f1af0d5bf178b86fbe596 Mon Sep 17 00:00:00 2001 From: ZeWaka Date: Thu, 22 Aug 2024 20:13:37 -0700 Subject: [PATCH 08/15] guh --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c69b0688..4c85ef6d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -19,7 +19,7 @@ jobs: - uses: dtolnay/rust-toolchain@nightly with: targets: x86_64-pc-windows-msvc - components: clippy + components: clippy, rustfmt - uses: Swatinem/rust-cache@v2 From be35b8d2de79e3b6015db19ca606c84f4f94c51a Mon Sep 17 00:00:00 2001 From: ZeWaka Date: Thu, 22 Aug 2024 21:13:17 -0700 Subject: [PATCH 09/15] rust-srtc --- .github/workflows/rust.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4c85ef6d..faada34e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -15,11 +15,12 @@ jobs: - uses: dtolnay/rust-toolchain@nightly with: targets: i686-pc-windows-msvc + components: clippy, rustfmt, rust-src - uses: dtolnay/rust-toolchain@nightly with: targets: x86_64-pc-windows-msvc - components: clippy, rustfmt + components: clippy, rustfmt, rust-src - uses: Swatinem/rust-cache@v2 From d45628d7c5ee1c2fe2e523f2f60f4bb012caa0c6 Mon Sep 17 00:00:00 2001 From: ZeWaka Date: Thu, 22 Aug 2024 21:14:09 -0700 Subject: [PATCH 10/15] target win7 with the CI i guess actually --- .github/workflows/rust.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index faada34e..91b573ea 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -14,7 +14,7 @@ jobs: - uses: dtolnay/rust-toolchain@nightly with: - targets: i686-pc-windows-msvc + targets: i686-win7-windows-msvc components: clippy, rustfmt, rust-src - uses: dtolnay/rust-toolchain@nightly @@ -25,7 +25,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - name: Clippy (all features) - run: cargo clippy --target i686-pc-windows-msvc --features all --locked -- -D warnings + run: cargo clippy --target i686-win7-windows-msvc --features all --locked -- -D warnings - name: Rustfmt run: cargo fmt -- --check From 710922e57a531aaf76f75872ca07b10831824e0d Mon Sep 17 00:00:00 2001 From: ZeWaka Date: Thu, 22 Aug 2024 21:20:00 -0700 Subject: [PATCH 11/15] this?? --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 91b573ea..f62c59c4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@nightly + - uses: dtolnay/rust-toolchain@stable with: targets: i686-win7-windows-msvc components: clippy, rustfmt, rust-src From d32674af290c024cb52eb69a88ddd788f612957a Mon Sep 17 00:00:00 2001 From: ZeWaka Date: Thu, 22 Aug 2024 21:55:14 -0700 Subject: [PATCH 12/15] tthis? --- .github/workflows/rust.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index f62c59c4..95319ad9 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@nightly with: targets: i686-win7-windows-msvc - components: clippy, rustfmt, rust-src + components: clippy, rustfmt - uses: dtolnay/rust-toolchain@nightly with: From acc845a399b73c8ece0695f5b7eb68ff599fac58 Mon Sep 17 00:00:00 2001 From: ZeWaka Date: Thu, 22 Aug 2024 22:06:24 -0700 Subject: [PATCH 13/15] gjfgyhj --- .github/workflows/rust.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 95319ad9..6b546653 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -15,7 +15,6 @@ jobs: - uses: dtolnay/rust-toolchain@nightly with: targets: i686-win7-windows-msvc - components: clippy, rustfmt - uses: dtolnay/rust-toolchain@nightly with: From 65b2ac426e5305abd8f33eafcb76f5d8c1cb580e Mon Sep 17 00:00:00 2001 From: ZeWaka Date: Thu, 22 Aug 2024 22:13:06 -0700 Subject: [PATCH 14/15] i mean --- .github/workflows/rust.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6b546653..109547f0 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -12,10 +12,6 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@nightly - with: - targets: i686-win7-windows-msvc - - uses: dtolnay/rust-toolchain@nightly with: targets: x86_64-pc-windows-msvc From 0141d8f34b906c9ec156c2f3ea450150e3396ffb Mon Sep 17 00:00:00 2001 From: ZeWaka Date: Thu, 22 Aug 2024 22:15:12 -0700 Subject: [PATCH 15/15] srsly? --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 109547f0..453e1c95 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -20,7 +20,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - name: Clippy (all features) - run: cargo clippy --target i686-win7-windows-msvc --features all --locked -- -D warnings + run: cargo clippy -Z build-std --target i686-win7-windows-msvc --features all --locked -- -D warnings - name: Rustfmt run: cargo fmt -- --check