Skip to content

Commit

Permalink
Cargo.toml: suppress resolver warning on nightly
Browse files Browse the repository at this point in the history
```
warning: some crates are on edition 2021 which defaults to `resolver = "2"`, but virtual workspaces default to `resolver = "1"`
```
  • Loading branch information
tamird committed Jul 7, 2023
1 parent 9ca0af1 commit e08c647
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ members = [
"bpf/aya-log-ebpf",
"test/integration-ebpf",
]
resolver = "2"

default-members = [
"aya",
Expand Down
2 changes: 1 addition & 1 deletion aya-log-parser/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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" }
Expand Down
1 change: 1 addition & 0 deletions bpf/aya-bpf-cty/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 3 additions & 3 deletions bpf/aya-bpf-cty/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -63,15 +63,15 @@ 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;
}

#[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;
Expand Down

0 comments on commit e08c647

Please sign in to comment.