Skip to content

Commit 12edeeb

Browse files
technetosanakryiko
authored andcommitted
Bump libbpf related crates to latest versions and bump edition to 2021
Signed-off-by: technetos <[email protected]>
1 parent 890c8fa commit 12edeeb

File tree

7 files changed

+57
-80
lines changed

7 files changed

+57
-80
lines changed

examples/rust/Cargo.lock

Lines changed: 39 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/rust/profile/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ authors = ["Kuifeng Lee <[email protected]>"]
55
license = "GPL-2.0 OR BSD-3-Clause"
66

77
[dependencies]
8-
libbpf-rs = "0.14.0"
8+
libbpf-rs = "0.19"
99
nix = "0.24.1"
1010
blazesym = { git = "https://github.com/libbpf/blazesym.git", features = ["cheader"] }
1111
libc = "*"
1212
clap = { version = "3.1.18", features = ["derive"] }
1313

1414
[build-dependencies]
15-
libbpf-cargo = "0.9.3"
15+
libbpf-cargo = "0.13"

examples/rust/profile/build.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ fn main() {
1717
// all up.
1818
create_dir_all("./src/bpf/.output").unwrap();
1919
let skel = Path::new("./src/bpf/.output/profile.skel.rs");
20-
SkeletonBuilder::new(SRC)
21-
.generate(&skel)
20+
SkeletonBuilder::new()
21+
.source(SRC)
22+
.build_and_generate(&skel)
2223
.expect("bpf compilation failed");
2324
println!("cargo:rerun-if-changed={}", SRC);
2425
}

examples/rust/tracecon/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
name = "tracecon"
33
version = "0.1.0"
44
authors = ["Magnus Kulke <[email protected]>"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "GPL-2.0 OR BSD-3-Clause"
77

88
[dependencies]
99
anyhow = "1.0"
10-
libbpf-rs = "0.14.0"
10+
libbpf-rs = "0.19"
1111
libc = "0.2"
1212
structopt = "0.3"
1313
ctrlc = "3.1"
1414
object = "0.25"
1515
plain = "0.2"
1616

1717
[build-dependencies]
18-
libbpf-cargo = "0.9.3"
18+
libbpf-cargo = "0.13"

examples/rust/tracecon/build.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ fn main() {
1616
// all up.
1717
create_dir_all("./src/bpf/.output").unwrap();
1818
let skel = Path::new("./src/bpf/.output/tracecon.skel.rs");
19-
SkeletonBuilder::new(SRC)
20-
.generate(&skel)
19+
SkeletonBuilder::new()
20+
.source(SRC)
21+
.build_and_generate(&skel)
2122
.expect("bpf compilation failed");
2223
println!("cargo:rerun-if-changed={}", SRC);
2324
}

examples/rust/xdp/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
name = "xdp"
33
version = "0.1.0"
44
authors = ["Hengqi Chen <[email protected]>"]
5-
edition = "2018"
5+
edition = "2021"
66

77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
1010
anyhow = "1.0"
1111
ctrlc = { version = "3.0", features = ["termination"] }
1212
libc = "0.2"
13-
libbpf-rs = "0.14.0"
13+
libbpf-rs = "0.19"
1414
structopt = "0.3"
1515

1616
[build-dependencies]
17-
libbpf-cargo = "0.9.3"
17+
libbpf-cargo = "0.13"

examples/rust/xdp/build.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ fn main() {
1616
// all up.
1717
create_dir_all("./src/bpf/.output").unwrap();
1818
let skel = Path::new("./src/bpf/.output/xdppass.skel.rs");
19-
SkeletonBuilder::new(SRC).generate(&skel).unwrap();
19+
SkeletonBuilder::new()
20+
.source(SRC)
21+
.build_and_generate(&skel)
22+
.unwrap();
2023
println!("cargo:rerun-if-changed={}", SRC);
2124
}

0 commit comments

Comments
 (0)