From 1174a45416b953b1528500604afae7ad0e2e8859 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Tue, 26 Nov 2024 15:01:29 -0500
Subject: [PATCH] Remove duplicate instances of `-Z build-std`

---
 test.sh                                  | 4 +++-
 {{project-name}}-ebpf/.cargo/config.toml | 4 ----
 {{project-name}}/build.rs                | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/test.sh b/test.sh
index a307c53..b91133a 100755
--- a/test.sh
+++ b/test.sh
@@ -93,7 +93,9 @@ case $OS in
   # ${CRATE_NAME} activates ${CRATE_NAME}-common's aya dependency, we end up trying to compile the
   # panic handler twice: once from the bpf program, and again from std via aya.
   cargo clippy --exclude "${CRATE_NAME}-ebpf" --all-targets --workspace -- --deny warnings
-  cargo -Z unstable-options -C "${CRATE_NAME}-ebpf" hack clippy --feature-powerset -- --deny warnings
+  pushd "${CRATE_NAME}-ebpf"
+  cargo clippy -- --deny warnings
+  popd
 
   expect <<EOF
     set timeout 30        ;# Increase timeout if necessary
diff --git a/{{project-name}}-ebpf/.cargo/config.toml b/{{project-name}}-ebpf/.cargo/config.toml
index d8d7a20..3ff5764 100644
--- a/{{project-name}}-ebpf/.cargo/config.toml
+++ b/{{project-name}}-ebpf/.cargo/config.toml
@@ -1,7 +1,3 @@
-# We have this so that one doesn't need to manually pass
-# --target=bpfel-unknown-none -Z build-std=core when running cargo
-# check/build/doc etc.
-#
 # NB: this file gets loaded only if you run cargo from this directory, it's
 # ignored if you run from the workspace root. See
 # https://doc.rust-lang.org/cargo/reference/config.html#hierarchical-structure
diff --git a/{{project-name}}/build.rs b/{{project-name}}/build.rs
index fa41cc9..a79b46b 100644
--- a/{{project-name}}/build.rs
+++ b/{{project-name}}/build.rs
@@ -60,8 +60,6 @@ fn main() {
         let mut cmd = Command::new("cargo");
         cmd.args([
             "build",
-            "-Z",
-            "build-std=core",
             "--bins",
             "--message-format=json",
             "--release",