From e08c6471dd351a1b717a38301a0ded5f04d1450d Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Fri, 7 Jul 2023 16:55:10 -0400
Subject: [PATCH] Cargo.toml: suppress resolver warning on nightly

```
warning: some crates are on edition 2021 which defaults to `resolver = "2"`, but virtual workspaces default to `resolver = "1"`
```
---
 Cargo.toml                 | 1 +
 aya-log-parser/Cargo.toml  | 2 +-
 bpf/aya-bpf-cty/Cargo.toml | 1 +
 bpf/aya-bpf-cty/src/lib.rs | 6 +++---
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8f448061b..03ac2810e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,7 @@ members = [
     "bpf/aya-log-ebpf",
     "test/integration-ebpf",
 ]
+resolver = "2"
 
 default-members = [
     "aya",
diff --git a/aya-log-parser/Cargo.toml b/aya-log-parser/Cargo.toml
index d76ae6b01..f47cb9f3e 100644
--- a/aya-log-parser/Cargo.toml
+++ b/aya-log-parser/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "aya-log-parser"
 version = "0.1.11-dev.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 aya-log-common = { path = "../aya-log-common" }
diff --git a/bpf/aya-bpf-cty/Cargo.toml b/bpf/aya-bpf-cty/Cargo.toml
index 8c8492221..5cd8d69c9 100644
--- a/bpf/aya-bpf-cty/Cargo.toml
+++ b/bpf/aya-bpf-cty/Cargo.toml
@@ -1,5 +1,6 @@
 [package]
 authors = ["Jorge Aparicio <jorge@japaric.io>"]
+edition = "2021"
 categories = ["embedded", "external-ffi-bindings" ,"no-std"]
 description = "Type aliases to C types like c_int for use with bindgen"
 documentation = "https://docs.rs/cty"
diff --git a/bpf/aya-bpf-cty/src/lib.rs b/bpf/aya-bpf-cty/src/lib.rs
index 7828e0ee4..aff438d39 100644
--- a/bpf/aya-bpf-cty/src/lib.rs
+++ b/bpf/aya-bpf-cty/src/lib.rs
@@ -46,7 +46,7 @@ mod ad {
     target_arch = "riscv64"
 ))]
 mod ad {
-    pub type c_char = ::c_uchar;
+    pub type c_char = super::c_uchar;
 
     pub type c_int = i32;
     pub type c_uint = u32;
@@ -63,7 +63,7 @@ mod ad {
     target_arch = "xtensa"
 ))]
 mod ad {
-    pub type c_char = ::c_schar;
+    pub type c_char = super::c_schar;
 
     pub type c_int = i32;
     pub type c_uint = u32;
@@ -71,7 +71,7 @@ mod ad {
 
 #[cfg(target_arch = "msp430")]
 mod ad {
-    pub type c_char = ::c_uchar;
+    pub type c_char = super::c_uchar;
 
     pub type c_int = i16;
     pub type c_uint = u16;