Merge pull request #34 from dmitris/edition-2021

use edition 2021
pull/35/head
Dave Tucker 3 years ago committed by GitHub
commit bdcf172ec4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,7 +1,7 @@
[package] [package]
name = "xtask" name = "xtask"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

@ -1,7 +1,7 @@
[package] [package]
name = "{{project-name}}-common" name = "{{project-name}}-common"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2021"
[features] [features]
default = [] default = []

@ -1,7 +1,7 @@
[package] [package]
name = "{{ project-name }}-ebpf" name = "{{ project-name }}-ebpf"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2021"
[dependencies] [dependencies]
aya-bpf = { git = "http://github.com/aya-rs/aya", branch = "main" } aya-bpf = { git = "http://github.com/aya-rs/aya", branch = "main" }

@ -1,7 +1,7 @@
[package] [package]
name = "{{project-name}}" name = "{{project-name}}"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2021"
publish = false publish = false
[dependencies] [dependencies]

@ -14,7 +14,6 @@ use aya::programs::SockOps;
use aya::maps::{MapRefMut,SockHash}; use aya::maps::{MapRefMut,SockHash};
use aya::programs::SkMsg; use aya::programs::SkMsg;
use {{crate_name}}_common::SockKey; use {{crate_name}}_common::SockKey;
use std::convert::TryFrom;
{%- when "xdp" -%} {%- when "xdp" -%}
use anyhow::Context; use anyhow::Context;
use aya::programs::{Xdp, XdpFlags}; use aya::programs::{Xdp, XdpFlags};
@ -31,7 +30,6 @@ use aya::{programs::BtfTracePoint, Btf};
{%- endcase %} {%- endcase %}
use log::info; use log::info;
use simplelog::{ColorChoice, ConfigBuilder, LevelFilter, TermLogger, TerminalMode}; use simplelog::{ColorChoice, ConfigBuilder, LevelFilter, TermLogger, TerminalMode};
use std::convert::TryInto;
use structopt::StructOpt; use structopt::StructOpt;
use tokio::signal; use tokio::signal;

Loading…
Cancel
Save