General Repository Cleanup

.github/buildomat/jobs/opte-api.sh

@@ -3,7 +3,7 @@
 #: name = "opte-api"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-02-06"
+#: rust_toolchain = "nightly-2024-05-12"
 #: output_rules = []
 #:
 
@@ -24,7 +24,7 @@ header "check API_VERSION"
 ./check-api-version.sh
 
 header "check style"
-ptime -m cargo +nightly-2024-02-06 fmt -- --check
+ptime -m cargo +nightly-2024-05-12 fmt -- --check
 
 header "analyze std"
 ptime -m cargo clippy --all-targets

.github/buildomat/jobs/opte-ioctl.sh

@@ -3,7 +3,7 @@
 #: name = "opte-ioctl"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-02-06"
+#: rust_toolchain = "nightly-2024-05-12"
 #: output_rules = []
 #:
 
@@ -21,7 +21,7 @@ rustc --version
 cd lib/opte-ioctl
 
 header "check style"
-ptime -m cargo +nightly-2024-02-06 fmt -- --check
+ptime -m cargo +nightly-2024-05-12 fmt -- --check
 
 header "analyze"
 ptime -m cargo clippy --all-targets

.github/buildomat/jobs/opte.sh

@@ -3,7 +3,7 @@
 #: name = "opte"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-02-06"
+#: rust_toolchain = "nightly-2024-05-12"
 #: output_rules = []
 #:
 
@@ -21,7 +21,7 @@ rustc --version
 cd lib/opte
 
 header "check style"
-ptime -m cargo +nightly-2024-02-06 fmt -- --check
+ptime -m cargo +nightly-2024-05-12 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-2024-02-06 doc --no-default-features --features=api,std,engine,kernel
+	    cargo +nightly-2024-05-12 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-2024-02-06 clippy --no-default-features --features engine,kernel
+ptime -m cargo +nightly-2024-05-12 clippy --no-default-features --features engine,kernel
 
 header "test"
 ptime -m cargo test

.github/buildomat/jobs/opteadm.sh

@@ -3,7 +3,7 @@
 #: name = "opteadm"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-02-06"
+#: rust_toolchain = "nightly-2024-05-12"
 #: 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-2024-02-06 fmt -- --check
+ptime -m cargo +nightly-2024-05-12 fmt -- --check
 
 header "analyze"
 ptime -m cargo clippy --all-targets

.github/buildomat/jobs/oxide-vpc.sh

@@ -3,7 +3,7 @@
 #: name = "oxide-vpc"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-02-06"
+#: rust_toolchain = "nightly-2024-05-12"
 #: output_rules = []
 #:
 
@@ -21,7 +21,7 @@ rustc --version
 cd lib/oxide-vpc
 
 header "check style"
-ptime -m cargo +nightly-2024-02-06 fmt -- --check
+ptime -m cargo +nightly-2024-05-12 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-2024-02-06 doc --no-default-features --features=api,std,engine,kernel
+	    cargo +nightly-2024-05-12 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-2024-02-06 clippy --no-default-features --features engine,kernel
+ptime -m cargo +nightly-2024-05-12 clippy --no-default-features --features engine,kernel
 
 header "test"
 ptime -m cargo test

.github/buildomat/jobs/p5p.sh

@@ -3,7 +3,7 @@
 #: name = "opte-p5p"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-02-06"
+#: rust_toolchain = "nightly-2024-05-12"
 #: output_rules = [
 #:   "=/out/opte.p5p",
 #:   "=/out/opte.p5p.sha256",

.github/buildomat/jobs/xde.sh

@@ -3,7 +3,7 @@
 #: name = "opte-xde"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-02-06"
+#: rust_toolchain = "nightly-2024-05-12"
 #: output_rules = [
 #:   "=/work/debug/xde.dbg",
 #:   "=/work/debug/xde.dbg.sha256",
@@ -75,7 +75,7 @@ pushd xde
 cp xde.conf /work/xde.conf
 
 header "check style"
-ptime -m cargo +nightly-2024-02-06 fmt -p xde -p xde-link -- --check
+ptime -m cargo +nightly-2024-05-12 fmt -p xde -p xde-link -- --check
 
 header "analyze"
 ptime -m cargo clippy -- \
@@ -123,7 +123,7 @@ sha256sum $REL_TGT/xde_link.so > $REL_TGT/xde_link.so.sha256
 
 header "build xde integration tests"
 pushd xde-tests
-cargo +nightly-2024-02-06 fmt -- --check
+cargo +nightly-2024-05-12 fmt -- --check
 cargo clippy --all-targets
 cargo build --test loopback
 loopback_test=$(

bench/Cargo.toml

@@ -21,7 +21,7 @@ rand.workspace = true
 opte.workspace = true
 opte-test-utils.workspace = true
 oxide-vpc.workspace = true
-serde = { default_features = true, workspace = true }
+serde = { default-features = true, workspace = true }
 serde_json.workspace = true
 
 [dev-dependencies]

bin/opteadm/src/bin/opteadm.rs

@@ -433,6 +433,7 @@ fn opte_pkg_version() -> String {
     format!("{MAJOR_VERSION}.{API_VERSION}.{COMMIT_COUNT}")
 }
 
+#[allow(clippy::write_literal)]
 fn print_port_header(t: &mut impl Write) -> std::io::Result<()> {
     writeln!(
         t,
@@ -462,7 +463,7 @@ fn print_port(t: &mut impl Write, pi: PortInfo) -> std::io::Result<()> {
         t,
         "{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}",
         pi.name,
-        pi.mac_addr.to_string(),
+        pi.mac_addr,
         pi.ip4_addr.map(|x| x.to_string()).unwrap_or_else(|| none.clone()),
         pi.ephemeral_ip4_addr
             .map(|x| x.to_string())
@@ -492,12 +493,12 @@ fn print_port(t: &mut impl Write, pi: PortInfo) -> std::io::Result<()> {
                 .as_ref()
                 .and_then(|vec| vec.get(i))
                 .map(|x| x.to_string())
-                .unwrap_or_else(String::new),
+                .unwrap_or_default(),
             pi.floating_ip6_addrs
                 .as_ref()
                 .and_then(|vec| vec.get(i))
                 .map(|x| x.to_string())
-                .unwrap_or_else(String::new),
+                .unwrap_or_default(),
         )?;
     }
 
@@ -531,7 +532,7 @@ fn main() -> anyhow::Result<()> {
         Command::DumpLayer { port, name } => {
             let resp = &hdl.get_layer_by_name(&port, &name)?;
             print!("Port {port} - ");
-            print_layer(&resp)?;
+            print_layer(resp)?;
         }
 
         Command::ClearUft { port } => {

crates/derror-macro/src/lib.rs

@@ -59,7 +59,7 @@ pub fn derive_derror(
 
     let parsed_args = match Args::from_derive_input(&derive_input) {
         Ok(o) => o,
-        Err(e) => return TokenStream::from(e.write_errors()).into(),
+        Err(e) => return e.write_errors().into(),
     };
 
     let DeriveInput { ident, data, .. } = derive_input;
@@ -82,7 +82,7 @@ pub fn derive_derror(
         let static_name_val =
             syn::LitByteStr::new(&var_name_bytes, var_name.span());
 
-        // TODO: use c"" from Rust 1.77 onwards, and when syn gets that.
+        // TODO: use c"" once proc_macro_c_str_literals (https://github.com/rust-lang/rust/issues/119750) stabilised.
         cstr_decls.push(quote! {
             static #static_name: &CStr = if let Ok(s) = CStr::from_bytes_with_nul(#static_name_val) {
                 s

crates/illumos-sys-hdrs/src/kernel.rs

@@ -52,7 +52,6 @@ impl ddi_reset_cmd_t {
 
 // TODO Technically this is not a "raw" interface. This should live
 // somewhere else.
-use core::ptr;
 impl kmutex_t {
     pub fn new(mtype: kmutex_type_t) -> Self {
         let mut kmutex = kmutex_t { _opaque: 0 };
@@ -376,7 +375,7 @@ pub const DDI_IPL_10: c_int = 10;
 
 pub const DDI_SUCCESS: c_int = 0;
 pub const DDI_FAILURE: c_int = -1;
-pub const DDI_PSEUDO: *const c_char = b"ddi_pseudo\0".as_ptr() as *const c_char;
+pub const DDI_PSEUDO: *const c_char = c"ddi_pseudo".as_ptr();
 
 pub const KM_SLEEP: i32 = 0x0000;
 pub const KM_NOSLEEP: i32 = 0x0001;
@@ -387,8 +386,7 @@ pub const S_IFCHR: c_int = 0x2000;
 
 pub const MAC_VERSION_V1: c_int = 0x1;
 pub const MAC_VERSION: c_int = MAC_VERSION_V1;
-pub const MAC_PLUGIN_IDENT_ETHER: *const c_char =
-    b"mac_ether\0".as_ptr() as *const c_char;
+pub const MAC_PLUGIN_IDENT_ETHER: *const c_char = c"mac_ether".as_ptr();
 
 pub type periodic_cb = unsafe extern "C" fn(arg: *mut c_void);
 

crates/opte-api/src/dns.rs

@@ -9,7 +9,6 @@
 use alloc::str;
 use alloc::string::String;
 use alloc::vec::Vec;
-use core::convert::TryFrom;
 use core::fmt;
 use core::str::FromStr;
 use serde::Deserialize;

crates/opte-api/src/ip.rs

@@ -9,7 +9,6 @@ use crate::DomainName;
 use alloc::string::String;
 use alloc::string::ToString;
 use alloc::vec::Vec;
-use core::convert::AsRef;
 use core::fmt;
 use core::fmt::Debug;
 use core::fmt::Display;

crates/opte-api/src/lib.rs

@@ -47,7 +47,7 @@ pub use ulp::*;
 ///
 /// We rely on CI and the check-api-version.sh script to verify that
 /// this number is incremented anytime the oxide-api code changes.
-pub const API_VERSION: u64 = 30;
+pub const API_VERSION: u64 = 31;
 
 /// Major version of the OPTE package.
 pub const MAJOR_VERSION: u64 = 0;

crates/opte-api/src/mac.rs

@@ -7,7 +7,6 @@
 use alloc::str::FromStr;
 use alloc::string::String;
 use alloc::vec::Vec;
-use core::convert::AsRef;
 use core::fmt;
 use core::fmt::Debug;
 use core::fmt::Display;

lib/opte/Cargo.toml

@@ -9,7 +9,7 @@ repository.workspace = true
 [features]
 default = ["api", "std"]
 api = []
-engine = ["api", "dep:crc32fast", "dep:heapless", "dep:itertools", "dep:zerocopy"]
+engine = ["api", "dep:crc32fast", "dep:derror-macro", "dep:heapless", "dep:itertools", "dep:zerocopy"]
 kernel = ["illumos-sys-hdrs/kernel"]
 # This feature indicates that OPTE is being built with std. This is
 # mostly useful to consumers of the API, providing convenient methods
@@ -22,7 +22,7 @@ test-help = []
 usdt = ["std", "dep:usdt"]
 
 [dependencies]
-derror-macro.workspace = true
+derror-macro = { workspace = true, optional = true }
 illumos-sys-hdrs.workspace = true
 kstat-macro.workspace = true
 opte-api.workspace = true

lib/opte/build.rs

@@ -1,5 +1,7 @@
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo::rustc-check-cfg=cfg(usdt_stable_asm)");
+    println!("cargo::rustc-check-cfg=cfg(usdt_stable_asm_sym)");
 
     if version_check::is_min_version("1.59").unwrap_or(false) {
         println!("cargo:rustc-cfg=usdt_stable_asm");