Skip to content

Commit

Permalink
Chores: Toolchains, Dependencies, Imports (#400)
Browse files Browse the repository at this point in the history
* Chore: Update toolchains, dependencies

This simply updates to the latest stable/nightly Rust toolchains, and
runs `cargo update` to pull in the latest version of related
dependencies -- at least one of the locked dependencies was broken on
newer nightlies.

* Rerun Cargo-fmt

* Chore: bump pcap-parser version

Pcap-parser was holding back a shared memchr version. Other dependencies
will follow as appropriate.

* Chore: Simplify duplicate alloc/std imports

Closes #391.

* Bump API_VERSION, move MAJOR_VERSION to api

* Chore: Bump most dependencies

This excludes smoltcp and zerocopy, both of which have made significant
API changes since we last updated.

* Fix XDE test with latest falcon

* Chore: Update Zerocopy -> 0.7

* Update smoltcp -> 0.10

This required a bit more work than I'd hoped.

One significant benefit is that we can greatly simplify some of the DHCP
option insertion logic: we no longer need to perform surgery on built
options to remove/insert end markers etc. This also gives us some cause
to simplify and unify long options in our own `emit` function.

Smoltcp's refactor of IPv6 types are somewhat less ergonomic,
particularly for length computation.

* Remove some accidental testing leftovers.

* Respond to review feedback
  • Loading branch information
FelixMcFelix authored Oct 26, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 258a8b5 commit c0564a0
Showing 63 changed files with 994 additions and 1,036 deletions.
4 changes: 2 additions & 2 deletions .github/buildomat/jobs/opte-api.sh
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#: name = "opte-api"
#: variety = "basic"
#: target = "helios-2.0"
#: rust_toolchain = "nightly-2023-01-12"
#: rust_toolchain = "nightly-2023-10-23"
#: output_rules = []
#:

@@ -24,7 +24,7 @@ header "check API_VERSION"
./check-api-version.sh

header "check style"
ptime -m cargo +nightly-2023-01-12 fmt -- --check
ptime -m cargo +nightly-2023-10-23 fmt -- --check

header "analyze std"
ptime -m cargo clippy --all-targets
4 changes: 2 additions & 2 deletions .github/buildomat/jobs/opte-ioctl.sh
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#: name = "opte-ioctl"
#: variety = "basic"
#: target = "helios-2.0"
#: rust_toolchain = "nightly-2023-01-12"
#: rust_toolchain = "nightly-2023-10-23"
#: output_rules = []
#:

@@ -21,7 +21,7 @@ rustc --version
cd lib/opte-ioctl

header "check style"
ptime -m cargo +nightly-2023-01-12 fmt -- --check
ptime -m cargo +nightly-2023-10-23 fmt -- --check

header "analyze"
ptime -m cargo clippy --all-targets
8 changes: 4 additions & 4 deletions .github/buildomat/jobs/opte.sh
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#: name = "opte"
#: variety = "basic"
#: target = "helios-2.0"
#: rust_toolchain = "nightly-2023-01-12"
#: rust_toolchain = "nightly-2023-10-23"
#: output_rules = []
#:

@@ -21,7 +21,7 @@ rustc --version
cd lib/opte

header "check style"
ptime -m cargo +nightly-2023-01-12 fmt -- --check
ptime -m cargo +nightly-2023-10-23 fmt -- --check

header "check docs"
#
@@ -30,13 +30,13 @@ header "check docs"
#
# Use nightly which is needed for the `kernel` feature.
RUSTDOCFLAGS="-D warnings" ptime -m \
cargo +nightly-2023-01-12 doc --no-default-features --features=api,std,engine,kernel
cargo +nightly-2023-10-23 doc --no-default-features --features=api,std,engine,kernel

header "analyze std + api"
ptime -m cargo clippy --all-targets

header "analyze no_std + engine + kernel"
ptime -m cargo +nightly-2023-01-12 clippy --no-default-features --features engine,kernel
ptime -m cargo +nightly-2023-10-23 clippy --no-default-features --features engine,kernel

header "test"
ptime -m cargo test
4 changes: 2 additions & 2 deletions .github/buildomat/jobs/opteadm.sh
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#: name = "opteadm"
#: variety = "basic"
#: target = "helios-2.0"
#: rust_toolchain = "nightly-2023-01-12"
#: rust_toolchain = "nightly-2023-10-23"
#: output_rules = [
#: "=/work/debug/opteadm",
#: "=/work/debug/opteadm.debug.sha256",
@@ -26,7 +26,7 @@ rustc --version
pushd bin/opteadm

header "check style"
ptime -m cargo +nightly-2023-01-12 fmt -- --check
ptime -m cargo +nightly-2023-10-23 fmt -- --check

header "analyze"
ptime -m cargo clippy --all-targets
8 changes: 4 additions & 4 deletions .github/buildomat/jobs/oxide-vpc.sh
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#: name = "oxide-vpc"
#: variety = "basic"
#: target = "helios-2.0"
#: rust_toolchain = "nightly-2023-01-12"
#: rust_toolchain = "nightly-2023-10-23"
#: output_rules = []
#:

@@ -21,7 +21,7 @@ rustc --version
cd lib/oxide-vpc

header "check style"
ptime -m cargo +nightly-2023-01-12 fmt -- --check
ptime -m cargo +nightly-2023-10-23 fmt -- --check

header "check docs"
#
@@ -30,13 +30,13 @@ header "check docs"
#
# Use nightly which is needed for the `kernel` feature.
RUSTDOCFLAGS="-D warnings" ptime -m \
cargo +nightly-2023-01-12 doc --no-default-features --features=api,std,engine,kernel
cargo +nightly-2023-10-23 doc --no-default-features --features=api,std,engine,kernel

header "analyze std + api + usdt"
ptime -m cargo clippy --features usdt --all-targets

header "analyze no_std + engine + kernel"
ptime -m cargo +nightly-2023-01-12 clippy --no-default-features --features engine,kernel
ptime -m cargo +nightly-2023-10-23 clippy --no-default-features --features engine,kernel

header "test"
ptime -m cargo test
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/p5p.sh
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#: name = "opte-p5p"
#: variety = "basic"
#: target = "helios-2.0"
#: rust_toolchain = "nightly-2023-01-12"
#: rust_toolchain = "nightly-2023-10-23"
#: output_rules = [
#: "=/out/opte.p5p",
#: "=/out/opte.p5p.sha256",
6 changes: 3 additions & 3 deletions .github/buildomat/jobs/xde.sh
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#: name = "opte-xde"
#: variety = "basic"
#: target = "helios-2.0"
#: rust_toolchain = "nightly-2023-01-12"
#: rust_toolchain = "nightly-2023-10-23"
#: output_rules = [
#: "=/work/debug/xde.dbg",
#: "=/work/debug/xde.dbg.sha256",
@@ -66,7 +66,7 @@ pushd xde
cp xde.conf /work/xde.conf

header "check style"
ptime -m cargo +nightly-2023-01-12 fmt -p xde -p xde-link -- --check
ptime -m cargo +nightly-2023-10-23 fmt -p xde -p xde-link -- --check

header "analyze"
ptime -m cargo clippy -- --allow clippy::uninlined-format-args
@@ -112,7 +112,7 @@ sha256sum $REL_TGT/xde_link.so > $REL_TGT/xde_link.so.sha256

header "build xde integration tests"
pushd xde-tests
cargo +nightly-2023-01-12 fmt -- --check
cargo +nightly-2023-10-23 fmt -- --check
cargo clippy --all-targets
cargo build --test loopback
loopback_test=$(
Loading

0 comments on commit c0564a0

Please sign in to comment.