From 6ca7d53733633d168b2d26cf34836b96b922895d Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Mon, 10 Jul 2023 17:17:38 -0400 Subject: [PATCH] Remove detritus - rustfmt settings are hierarchical. - integration-ebpf is always compiled at a distance with flags provided. - .cargo/config.toml is not respected except at the root of the workspace[0]. [0] https://doc.rust-lang.org/cargo/reference/config.html#hierarchical-structure --- .cargo/{config => config.toml} | 0 bpf/.cargo/config.toml | 6 ------ test/integration-ebpf/.cargo/config.toml | 6 ------ test/integration-ebpf/rust-toolchain.toml | 2 -- test/integration-ebpf/rustfmt.toml | 1 - 5 files changed, 15 deletions(-) rename .cargo/{config => config.toml} (100%) delete mode 100644 bpf/.cargo/config.toml delete mode 100644 test/integration-ebpf/.cargo/config.toml delete mode 100644 test/integration-ebpf/rust-toolchain.toml delete mode 120000 test/integration-ebpf/rustfmt.toml diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml diff --git a/bpf/.cargo/config.toml b/bpf/.cargo/config.toml deleted file mode 100644 index 5d7e5915..00000000 --- a/bpf/.cargo/config.toml +++ /dev/null @@ -1,6 +0,0 @@ -[build] -target-dir = "../target" -target = "bpfel-unknown-none" - -[unstable] -build-std = ["core"] \ No newline at end of file diff --git a/test/integration-ebpf/.cargo/config.toml b/test/integration-ebpf/.cargo/config.toml deleted file mode 100644 index d89a98b0..00000000 --- a/test/integration-ebpf/.cargo/config.toml +++ /dev/null @@ -1,6 +0,0 @@ -[build] -target-dir = "../../target" -target = "bpfel-unknown-none" - -[unstable] -build-std = ["core"] diff --git a/test/integration-ebpf/rust-toolchain.toml b/test/integration-ebpf/rust-toolchain.toml deleted file mode 100644 index c046a094..00000000 --- a/test/integration-ebpf/rust-toolchain.toml +++ /dev/null @@ -1,2 +0,0 @@ -[toolchain] -channel="nightly" diff --git a/test/integration-ebpf/rustfmt.toml b/test/integration-ebpf/rustfmt.toml deleted file mode 120000 index 760eb840..00000000 --- a/test/integration-ebpf/rustfmt.toml +++ /dev/null @@ -1 +0,0 @@ -../../rustfmt.toml \ No newline at end of file