diff --git a/Cargo.lock b/Cargo.lock index 8f4a6c3..a9fb0b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -288,18 +288,18 @@ dependencies = [ [[package]] name = "capnp" -version = "0.23.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8c2ce958193219f203a6887788231a1aaa0b22ed012d67436ea3b87a9645c4" +checksum = "e17cef220241d3b5d1c4fa17acfbf830033a3927b94c65e46e7945898318ff43" dependencies = [ "embedded-io", ] [[package]] name = "capnpc" -version = "0.23.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1cd4f042d6725da6245bde08c9e7c74f6fcb2d8bd5e0378e57991be8d711d8" +checksum = "1b61282080d865d4d8eb5fd5368c3fe47c024db922c926f311404b364d01ebd0" dependencies = [ "capnp", ] diff --git a/risotto/Cargo.toml b/risotto/Cargo.toml index ddf064e..bd63424 100644 --- a/risotto/Cargo.toml +++ b/risotto/Cargo.toml @@ -15,7 +15,7 @@ exclude.workspace = true anyhow = "1.0.95" bincode = { version = "2.0.1", features = ["serde"] } bytes = "1.9.0" -capnp = "0.23.0" +capnp = "0.24.0" chrono = "0.4.40" clap = { version = "4.5.23", features = ["derive"] } clap-verbosity-flag = {version = "3.0.2", features = ["tracing"]} @@ -31,4 +31,4 @@ tracing = "0.1.41" tracing-subscriber = {version= "0.3.19", features = ["fmt", "env-filter"]} [build-dependencies] -capnpc = "0.23.0" +capnpc = "0.24.0" diff --git a/risotto/src/update_capnp.rs b/risotto/src/update_capnp.rs index 726d021..793f311 100644 --- a/risotto/src/update_capnp.rs +++ b/risotto/src/update_capnp.rs @@ -1194,12 +1194,12 @@ pub mod update { 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 = ::capnp::introspect::RawStructSchema { - encoded_node: &ENCODED_NODE, - nonunion_members: NONUNION_MEMBERS, - members_by_discriminant: MEMBERS_BY_DISCRIMINANT, - members_by_name: MEMBERS_BY_NAME, - }; + pub static RAW_SCHEMA: ::capnp::introspect::RawStructSchema = unsafe {::capnp::introspect::RawStructSchema::new( + &ENCODED_NODE, + 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,21,22,23,24,25,26,27,28,29,30]; pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[]; pub static MEMBERS_BY_NAME : &[u16] = &[20,21,11,14,19,26,22,23,10,9,24,17,27,28,29,30,16,15,18,13,25,4,6,5,7,8,2,3,12,1,0]; @@ -1417,12 +1417,12 @@ pub mod community { 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 = ::capnp::introspect::RawStructSchema { - encoded_node: &ENCODED_NODE, - nonunion_members: NONUNION_MEMBERS, - members_by_discriminant: MEMBERS_BY_DISCRIMINANT, - members_by_name: MEMBERS_BY_NAME, - }; + pub static RAW_SCHEMA: ::capnp::introspect::RawStructSchema = unsafe {::capnp::introspect::RawStructSchema::new( + &ENCODED_NODE, + NONUNION_MEMBERS, + MEMBERS_BY_DISCRIMINANT, + MEMBERS_BY_NAME + )}; pub static NONUNION_MEMBERS : &[u16] = &[0,1]; pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[]; pub static MEMBERS_BY_NAME : &[u16] = &[0,1]; @@ -1682,12 +1682,12 @@ pub mod extended_community { 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 = ::capnp::introspect::RawStructSchema { - encoded_node: &ENCODED_NODE, - nonunion_members: NONUNION_MEMBERS, - members_by_discriminant: MEMBERS_BY_DISCRIMINANT, - members_by_name: MEMBERS_BY_NAME, - }; + pub static RAW_SCHEMA: ::capnp::introspect::RawStructSchema = unsafe {::capnp::introspect::RawStructSchema::new( + &ENCODED_NODE, + NONUNION_MEMBERS, + MEMBERS_BY_DISCRIMINANT, + MEMBERS_BY_NAME + )}; pub static NONUNION_MEMBERS : &[u16] = &[0,1,2]; pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[]; pub static MEMBERS_BY_NAME : &[u16] = &[0,1,2]; @@ -1937,12 +1937,12 @@ pub mod large_community { 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 = ::capnp::introspect::RawStructSchema { - encoded_node: &ENCODED_NODE, - nonunion_members: NONUNION_MEMBERS, - members_by_discriminant: MEMBERS_BY_DISCRIMINANT, - members_by_name: MEMBERS_BY_NAME, - }; + pub static RAW_SCHEMA: ::capnp::introspect::RawStructSchema = unsafe {::capnp::introspect::RawStructSchema::new( + &ENCODED_NODE, + NONUNION_MEMBERS, + MEMBERS_BY_DISCRIMINANT, + MEMBERS_BY_NAME + )}; pub static NONUNION_MEMBERS : &[u16] = &[0,1,2]; pub static MEMBERS_BY_DISCRIMINANT : &[u16] = &[]; pub static MEMBERS_BY_NAME : &[u16] = &[0,1,2];