From afdb45341f0f62e29a34526297af38e36de57e84 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Tue, 18 Jul 2023 20:53:55 -0400
Subject: [PATCH] Remove branch specifications

The branch should be dictated by the repository.
---
 .cargo/config.toml                        |  2 +-
 Cargo.toml                                |  2 +-
 cargo-generate.toml                       |  4 ++--
 {{project-name}}-ebpf/.cargo/config.toml  |  2 +-
 {{project-name}}-ebpf/Cargo.toml          |  4 ++--
 {{project-name}}-ebpf/rust-toolchain.toml | 10 +++++++++-
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index f0ccbc9..35049cb 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,2 +1,2 @@
 [alias]
-xtask = "run --package xtask --"
\ No newline at end of file
+xtask = "run --package xtask --"
diff --git a/Cargo.toml b/Cargo.toml
index c386364..b05400c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,2 +1,2 @@
 [workspace]
-members = ["{{project-name}}", "{{project-name}}-common", "xtask"]
+members = ["xtask", "{{project-name}}", "{{project-name}}-common"]
diff --git a/cargo-generate.toml b/cargo-generate.toml
index a977b33..6026555 100644
--- a/cargo-generate.toml
+++ b/cargo-generate.toml
@@ -47,12 +47,12 @@ prompt = "Function name to attach the (u|uret)probe? (e.g getaddrinfo)"
 [conditional.'program_type == "cgroup_skb" || program_type == "classifier"'.placeholders.direction]
 type = "string"
 prompt = "Attach direction?"
-choices = [ "Ingress", "Egress" ]
+choices = ["Egress", "Ingress"]
 
 [conditional.'program_type == "cgroup_sockopt"'.placeholders.sockopt_target]
 type = "string"
 prompt = "Which socket option?"
-choices = [ "getsockopt", "setsockopt" ]
+choices = ["getsockopt", "setsockopt"]
 
 [conditional.'program_type == "sk_msg"'.placeholders.sock_map]
 type = "string"
diff --git a/{{project-name}}-ebpf/.cargo/config.toml b/{{project-name}}-ebpf/.cargo/config.toml
index 5d7e591..4302a7f 100644
--- a/{{project-name}}-ebpf/.cargo/config.toml
+++ b/{{project-name}}-ebpf/.cargo/config.toml
@@ -3,4 +3,4 @@ target-dir = "../target"
 target = "bpfel-unknown-none"
 
 [unstable]
-build-std = ["core"]
\ No newline at end of file
+build-std = ["core"]
diff --git a/{{project-name}}-ebpf/Cargo.toml b/{{project-name}}-ebpf/Cargo.toml
index 6b7c3e9..17c08d7 100644
--- a/{{project-name}}-ebpf/Cargo.toml
+++ b/{{project-name}}-ebpf/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-aya-bpf = { git = "https://github.com/aya-rs/aya", branch = "main" }
-aya-log-ebpf = { git = "https://github.com/aya-rs/aya", branch = "main" }
+aya-bpf = { git = "https://github.com/aya-rs/aya" }
+aya-log-ebpf = { git = "https://github.com/aya-rs/aya" }
 {{ project-name }}-common = { path = "../{{ project-name }}-common" }
 
 [[bin]]
diff --git a/{{project-name}}-ebpf/rust-toolchain.toml b/{{project-name}}-ebpf/rust-toolchain.toml
index 68a6ab9..24ce391 100644
--- a/{{project-name}}-ebpf/rust-toolchain.toml
+++ b/{{project-name}}-ebpf/rust-toolchain.toml
@@ -2,4 +2,12 @@
 channel = "nightly"
 # The source code of rustc, provided by the rust-src component, is needed for
 # building eBPF programs.
-components = [ "rustc", "rust-std", "cargo", "rust-docs", "rustfmt", "clippy", "rust-src" ]
+components = [
+    "cargo",
+    "clippy",
+    "rust-docs",
+    "rust-src",
+    "rust-std",
+    "rustc",
+    "rustfmt",
+]