diff --git a/Cargo.lock b/Cargo.lock index 70fe126..e50d028 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -175,18 +175,18 @@ checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "capnp" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe67a3f89b693d2163cf3d94129125463ac5913e1c4322f2db905aa631d3c67" +checksum = "fe8af2e2d255489928e31504fa51d86a41d040179098a8ad6828e0d11c54dcd6" dependencies = [ "embedded-io", ] [[package]] name = "capnpc" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642d771bf5096ad1963fdbb9839f22e7bb1e308a2d1456fb1ad6cc99bb691115" +checksum = "d6cdfa6b0df161a71201367910265b97180541ecdb48bd08e05ef8694c295d1f" dependencies = [ "capnp", ] @@ -950,7 +950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 02b5a60..c26b17d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ exclude = [ [dependencies] anyhow = "1.0" bytes = "1.9" -capnp = "0.24" +capnp = "0.25" chrono = "0.4" clap = { version = "4.5", features = ["derive"] } clap-verbosity-flag = { version = "3.0", features = ["tracing"] } @@ -32,4 +32,4 @@ tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] } [build-dependencies] -capnpc = "0.24" +capnpc = "0.25" diff --git a/src/sflow_capnp.rs b/src/sflow_capnp.rs index 491f2ed..c841c97 100644 --- a/src/sflow_capnp.rs +++ b/src/sflow_capnp.rs @@ -797,12 +797,13 @@ pub mod s_flow_flow_record { pub fn get_annotation_types(child_index: Option, index: u32) -> ::capnp::introspect::Type { ::capnp::introspect::panic_invalid_annotation_indices(child_index, index) } - pub static RAW_SCHEMA: ::capnp::introspect::RawStructSchema = unsafe {::capnp::introspect::RawStructSchema::new( - &ENCODED_NODE, + pub static ARENA: ::capnp::private::arena::GeneratedCodeArena = ::capnp::private::arena::GeneratedCodeArena::new(&ENCODED_NODE); + pub static RAW_SCHEMA: ::capnp::introspect::RawStructSchema = ::capnp::introspect::RawStructSchema::new( + &ARENA, NONUNION_MEMBERS, MEMBERS_BY_DISCRIMINANT, MEMBERS_BY_NAME - )}; + ); pub static NONUNION_MEMBERS : &[u16] = &[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]; pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[]; pub static MEMBERS_BY_NAME : &[u16] = &[1,2,3,4,10,16,18,11,13,12,14,9,6,8,7,15,17,19,0,20,5];