From 610e7092bb4af16280bb70d414c65bdc494728d6 Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 15:46:55 +0200 Subject: [PATCH 01/17] Copy canlog_derive --- packages/canlog_derive/CHANGELOG.md | 8 +++ packages/canlog_derive/Cargo.toml | 25 +++++++ packages/canlog_derive/LICENSE | 1 + packages/canlog_derive/NOTICE | 1 + packages/canlog_derive/README.md | 2 + packages/canlog_derive/src/lib.rs | 108 ++++++++++++++++++++++++++++ 6 files changed, 145 insertions(+) create mode 100644 packages/canlog_derive/CHANGELOG.md create mode 100644 packages/canlog_derive/Cargo.toml create mode 120000 packages/canlog_derive/LICENSE create mode 120000 packages/canlog_derive/NOTICE create mode 100644 packages/canlog_derive/README.md create mode 100644 packages/canlog_derive/src/lib.rs diff --git a/packages/canlog_derive/CHANGELOG.md b/packages/canlog_derive/CHANGELOG.md new file mode 100644 index 000000000000..5fda63a87a06 --- /dev/null +++ b/packages/canlog_derive/CHANGELOG.md @@ -0,0 +1,8 @@ +Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] \ No newline at end of file diff --git a/packages/canlog_derive/Cargo.toml b/packages/canlog_derive/Cargo.toml new file mode 100644 index 000000000000..bb2b76bd3766 --- /dev/null +++ b/packages/canlog_derive/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "canlog_derive" +version = "0.1.0" +description = "Crate with macro definitions for the canlog crate" +authors.workspace = true +edition.workspace = true +repository.workspace = true +homepage.workspace = true +license.workspace = true +readme = "README.md" +include = ["src", "Cargo.toml", "CHANGELOG.md", "LICENSE", "README.md"] + +[dependencies] +syn = { version = "2.0.100", features = ["derive"] } +quote = "1.0.40" +proc-macro2 = "1.0.94" +darling = "0.20.11" + +[dev-dependencies] +canlog = { path = "../canlog" } +serde = { workspace = true, features = ["derive"] } + +[lib] +proc-macro = true + diff --git a/packages/canlog_derive/LICENSE b/packages/canlog_derive/LICENSE new file mode 120000 index 000000000000..ea5b60640b01 --- /dev/null +++ b/packages/canlog_derive/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/packages/canlog_derive/NOTICE b/packages/canlog_derive/NOTICE new file mode 120000 index 000000000000..7e1b82f6e6a1 --- /dev/null +++ b/packages/canlog_derive/NOTICE @@ -0,0 +1 @@ +../NOTICE \ No newline at end of file diff --git a/packages/canlog_derive/README.md b/packages/canlog_derive/README.md new file mode 100644 index 000000000000..18aab6f04ef2 --- /dev/null +++ b/packages/canlog_derive/README.md @@ -0,0 +1,2 @@ +# Crate `canlog_derive` + diff --git a/packages/canlog_derive/src/lib.rs b/packages/canlog_derive/src/lib.rs new file mode 100644 index 000000000000..7babea6fe2aa --- /dev/null +++ b/packages/canlog_derive/src/lib.rs @@ -0,0 +1,108 @@ +//! Procedural macros for the canlog crate. Refer to the canlog crate documentation. + +#![forbid(unsafe_code)] + +use darling::FromVariant; +use proc_macro::TokenStream; +use proc_macro2::Ident; +use quote::quote; +use syn::{parse_macro_input, Data, DataEnum, DeriveInput}; + +#[proc_macro_derive(LogPriorityLevels, attributes(log_level))] +pub fn derive_log_priority(input: TokenStream) -> TokenStream { + let input = parse_macro_input!(input as DeriveInput); + let enum_ident = &input.ident; + + let Data::Enum(DataEnum { variants, .. }) = &input.data else { + panic!("This trait can only be derived for enums"); + }; + + // Declare a buffer and sink for each enum variant + let buffer_declarations = variants.iter().map(|variant| { + let variant_ident = &variant.ident; + let info = LogLevelInfo::from_variant(variant) + .unwrap_or_else(|_| panic!("Invalid attributes for log level: {}", variant_ident)); + + let buffer_ident = get_buffer_ident(variant_ident); + let sink_ident = get_sink_ident(variant_ident); + let capacity = info.capacity; + + quote! { + ::canlog::declare_log_buffer!(name = #buffer_ident, capacity = #capacity); + pub const #sink_ident: ::canlog::PrintProxySink<#enum_ident> = ::canlog::PrintProxySink(&#enum_ident::#variant_ident, &#buffer_ident); + } + }); + + // Match arms to get the corresponding buffer, sink and display name for each enum variant + let buffer_match_arms = variants.iter().map(|variant| { + let variant_ident = &variant.ident; + let buffer_ident = get_buffer_ident(variant_ident); + quote! { + Self::#variant_ident => &#buffer_ident, + } + }); + let sink_match_arms = variants.iter().map(|variant| { + let variant_ident = &variant.ident; + let sink_ident = get_sink_ident(variant_ident); + quote! { + Self::#variant_ident => &#sink_ident, + } + }); + let display_name_match_arms = variants.iter().map(|variant| { + let variant_ident = &variant.ident; + let display_name = LogLevelInfo::from_variant(variant).unwrap().name; + quote! { + Self::#variant_ident => #display_name, + } + }); + let variants_array = variants.iter().map(|variant| { + let variant_ident = &variant.ident; + quote! { Self::#variant_ident, } + }); + + // Generate buffer declarations and trait implementation + let trait_impl = quote! { + #(#buffer_declarations)* + + impl ::canlog::LogPriorityLevels for #enum_ident { + fn get_buffer(&self) -> &'static ::canlog::GlobalBuffer { + match self { + #(#buffer_match_arms)* + } + } + + fn get_sink(&self) -> &impl ::canlog::Sink { + match self { + #(#sink_match_arms)* + } + } + + fn display_name(&self) -> &'static str { + match self { + #(#display_name_match_arms)* + } + } + + fn get_priorities() -> &'static [Self] { + &[#(#variants_array)*] + } + } + }; + + trait_impl.into() +} + +#[derive(FromVariant)] +#[darling(attributes(log_level))] +struct LogLevelInfo { + capacity: usize, + name: String, +} + +fn get_sink_ident(variant_ident: &Ident) -> Ident { + quote::format_ident!("{}", variant_ident.to_string().to_uppercase()) +} + +fn get_buffer_ident(variant_ident: &Ident) -> Ident { + quote::format_ident!("{}_BUF", variant_ident.to_string().to_uppercase()) +} From 9b44026b124276569b4b07f8d5f863b5089f2bec Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 15:47:27 +0200 Subject: [PATCH 02/17] Copy canlog --- packages/canlog/CHANGELOG.md | 8 ++ packages/canlog/Cargo.toml | 27 ++++ packages/canlog/LICENSE | 1 + packages/canlog/NOTICE | 1 + packages/canlog/README.md | 2 + packages/canlog/src/lib.rs | 234 +++++++++++++++++++++++++++++++ packages/canlog/src/tests.rs | 226 +++++++++++++++++++++++++++++ packages/canlog/src/types/mod.rs | 92 ++++++++++++ 8 files changed, 591 insertions(+) create mode 100644 packages/canlog/CHANGELOG.md create mode 100644 packages/canlog/Cargo.toml create mode 120000 packages/canlog/LICENSE create mode 120000 packages/canlog/NOTICE create mode 100644 packages/canlog/README.md create mode 100644 packages/canlog/src/lib.rs create mode 100644 packages/canlog/src/tests.rs create mode 100644 packages/canlog/src/types/mod.rs diff --git a/packages/canlog/CHANGELOG.md b/packages/canlog/CHANGELOG.md new file mode 100644 index 000000000000..5fda63a87a06 --- /dev/null +++ b/packages/canlog/CHANGELOG.md @@ -0,0 +1,8 @@ +Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] \ No newline at end of file diff --git a/packages/canlog/Cargo.toml b/packages/canlog/Cargo.toml new file mode 100644 index 000000000000..ff0e982ca10c --- /dev/null +++ b/packages/canlog/Cargo.toml @@ -0,0 +1,27 @@ +[package] +name = "canlog" +version = "0.1.0" +description = "Crate for managing canister logs" +authors.workspace = true +edition.workspace = true +repository.workspace = true +homepage.workspace = true +license.workspace = true +readme = "README.md" +include = ["src", "Cargo.toml", "CHANGELOG.md", "LICENSE", "README.md"] + +[dependencies] +candid = { workspace = true } +canlog_derive = { path = "../canlog_derive", optional = true } +ic-canister-log = { workspace = true } +ic-cdk = { workspace = true } +regex = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } + +[dev-dependencies] +proptest = { workspace = true } +canlog_derive = { path = "../canlog_derive" } + +[features] +derive = ["dep:canlog_derive"] diff --git a/packages/canlog/LICENSE b/packages/canlog/LICENSE new file mode 120000 index 000000000000..ea5b60640b01 --- /dev/null +++ b/packages/canlog/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/packages/canlog/NOTICE b/packages/canlog/NOTICE new file mode 120000 index 000000000000..7e1b82f6e6a1 --- /dev/null +++ b/packages/canlog/NOTICE @@ -0,0 +1 @@ +../NOTICE \ No newline at end of file diff --git a/packages/canlog/README.md b/packages/canlog/README.md new file mode 100644 index 000000000000..601ac6113eaa --- /dev/null +++ b/packages/canlog/README.md @@ -0,0 +1,2 @@ +# Crate `canlog` + diff --git a/packages/canlog/src/lib.rs b/packages/canlog/src/lib.rs new file mode 100644 index 000000000000..7ea1b3ac1ce5 --- /dev/null +++ b/packages/canlog/src/lib.rs @@ -0,0 +1,234 @@ +//! This crate extends [`ic_canister_log`] to provide native support for log priority levels, +//! filtering and sorting. +//! +//! The main functionality is provided by the [`LogPriorityLevels`] and [`GetLogFilter`] traits +//! as well as the [`log`] macro. +//! +//! Custom log priority levels may be defined by declaring an enum and implementing the +//! [`LogPriorityLevels`] trait for it, usually through the [`derive`] annotation available with +//! the `derive` feature of [`canlog`]. +//! +//! Additionally, log filtering may be achieved by implementing the [`GetLogFilter`] trait on +//! the enum defining the log priorities. +//! +//! * Example: +//! ```rust +//! # #[cfg(feature="derive")] +//! # mod wrapper_module { +//! use canlog::{GetLogFilter, LogFilter, LogPriorityLevels, log}; +//! +//! #[derive(LogPriorityLevels)] +//! enum LogPriority { +//! #[log_level(capacity = 100, name = "INFO")] +//! Info, +//! #[log_level(capacity = 500, name = "DEBUG")] +//! Debug, +//! } +//! +//! impl GetLogFilter for LogPriority { +//! fn get_log_filter() -> LogFilter { +//! LogFilter::ShowAll +//! } +//! } +//! +//! fn main() { +//! log!(LogPriority::Info, "Some rather important message."); +//! log!(LogPriority::Debug, "Some less important message."); +//! } +//! # } +//! ``` +//! +//! **Expected Output:** +//! ```text +//! 2025-02-26 08:27:10 UTC: [Canister lxzze-o7777-77777-aaaaa-cai] INFO main.rs:13 Some rather important message. +//! 2025-02-26 08:27:10 UTC: [Canister lxzze-o7777-77777-aaaaa-cai] DEBUG main.rs:14 Some less important message. +//! ``` + +#![forbid(unsafe_code)] +#![forbid(missing_docs)] + +#[cfg(test)] +mod tests; +mod types; + +extern crate self as canlog; + +pub use crate::types::{LogFilter, Sort}; + +pub use ic_canister_log::{ + declare_log_buffer, export as export_logs, log as raw_log, GlobalBuffer, Sink, +}; +use serde::{Deserialize, Serialize}; + +#[cfg(any(feature = "derive", test))] +/// A procedural macro to implement [`LogPriorityLevels`] for an enum. +/// +/// This macro expects the variants to be annotated with `#[log_level(capacity = N, name = "NAME")]` +/// where `N` is an integer representing buffer capacity and `"NAME"` is a string display +/// representation for the corresponding log level. +/// +/// The enum annotated with `#[derive(LogPriorityLevels)]` must also implement the +/// [`Serialize`], [`Deserialize`], [`Clone`] and [`Copy`] traits. +/// +/// See the top-level crate documentation for example usage. +#[doc(inline)] +pub use canlog_derive::LogPriorityLevels; + +/// Wrapper for the [`ic_canister_log::log`](ic_canister_log::log!) macro that allows +/// logging for a given variant of an enum implementing the [`LogPriorityLevels`] +/// trait. See the example in the crate documentation. +#[macro_export] +macro_rules! log { + ($enum_variant:expr, $($args:tt)*) => { + { + use ::canlog::LogPriorityLevels; + ::canlog::raw_log!($enum_variant.get_sink(), $($args)*); + } + }; +} + +/// Represents a log priority level. This trait is meant to be implemented +/// automatically with the [`derive`](macro@derive) attribute macro which +/// is available with the `derive` feature of this crate. +pub trait LogPriorityLevels { + #[doc(hidden)] + fn get_buffer(&self) -> &'static GlobalBuffer; + #[doc(hidden)] + fn get_sink(&self) -> &impl Sink; + + /// Returns a display representation for a log priority level. + fn display_name(&self) -> &'static str; + + /// Returns an array containing all the log priority levels. + fn get_priorities() -> &'static [Self] + where + Self: Sized; +} + +/// Returns the [`LogFilter`] to check what entries to record. This trait should +/// be implemented manually. +pub trait GetLogFilter { + /// Returns a [`LogFilter`]. Only log entries matching this filter will be recorded. + fn get_log_filter() -> LogFilter; +} + +/// A single log entry. +#[derive(Clone, Debug, Eq, PartialEq, Deserialize, serde::Serialize)] +pub struct LogEntry { + /// The time at which the log entry is recorded. + pub timestamp: u64, + /// The log entry priority level. + pub priority: Priority, + /// The source file in which this log entry was generated. + pub file: String, + /// The line in [`file`] in which this log entry was generated. + pub line: u32, + /// The log message. + pub message: String, + /// The index of this entry starting from the last canister upgrade. + pub counter: u64, +} + +/// A container for log entries at a given log priority level. +#[derive(Clone, Debug, Deserialize, serde::Serialize)] +pub struct Log { + /// The log entries for this priority level. + pub entries: Vec>, +} + +impl Default for Log { + fn default() -> Self { + Self { entries: vec![] } + } +} + +impl<'de, Priority> Log +where + Priority: LogPriorityLevels + Clone + Copy + Deserialize<'de> + Serialize + 'static, +{ + /// Append all the entries from the given `Priority` to [`Log::entries`]. + pub fn push_logs(&mut self, priority: Priority) { + for entry in export_logs(priority.get_buffer()) { + self.entries.push(LogEntry { + timestamp: entry.timestamp, + counter: entry.counter, + priority, + file: entry.file.to_string(), + line: entry.line, + message: entry.message, + }); + } + } + + /// Append all the entries from all priority levels to [`Log::entries`]. + pub fn push_all(&mut self) { + Priority::get_priorities() + .iter() + .for_each(|priority| self.push_logs(*priority)); + } + + /// Serialize the logs contained in `entries` into a JSON string. + /// + /// If the resulting string is larger than `max_body_size` bytes, + /// truncate `entries` so the resulting serialized JSON string + /// contains no more than `max_body_size` bytes. + pub fn serialize_logs(&self, max_body_size: usize) -> String { + let mut entries_json: String = serde_json::to_string(&self).unwrap_or_default(); + + if entries_json.len() > max_body_size { + let mut left = 0; + let mut right = self.entries.len(); + + while left < right { + let mid = left + (right - left) / 2; + let mut temp_log = self.clone(); + temp_log.entries.truncate(mid); + let temp_entries_json = serde_json::to_string(&temp_log).unwrap_or_default(); + + if temp_entries_json.len() <= max_body_size { + entries_json = temp_entries_json; + left = mid + 1; + } else { + right = mid; + } + } + } + entries_json + } + + /// Sort the log entries according `sort_order`. + pub fn sort_logs(&mut self, sort_order: Sort) { + match sort_order { + Sort::Ascending => self.sort_asc(), + Sort::Descending => self.sort_desc(), + } + } + + fn sort_asc(&mut self) { + self.entries.sort_by(|a, b| a.timestamp.cmp(&b.timestamp)); + } + + fn sort_desc(&mut self) { + self.entries.sort_by(|a, b| b.timestamp.cmp(&a.timestamp)); + } +} + +#[doc(hidden)] +#[derive(Debug)] +pub struct PrintProxySink(pub &'static Priority, pub &'static GlobalBuffer); + +impl Sink for PrintProxySink { + fn append(&self, entry: ic_canister_log::LogEntry) { + let message = format!( + "{} {}:{} {}", + self.0.display_name(), + entry.file, + entry.line, + entry.message, + ); + if Priority::get_log_filter().is_match(&message) { + ic_cdk::println!("{}", message); + self.1.append(entry) + } + } +} diff --git a/packages/canlog/src/tests.rs b/packages/canlog/src/tests.rs new file mode 100644 index 000000000000..c31f20c7874c --- /dev/null +++ b/packages/canlog/src/tests.rs @@ -0,0 +1,226 @@ +use crate::{log, GetLogFilter, Log, LogEntry, LogFilter, LogPriorityLevels, Sort}; +use proptest::{prop_assert, proptest}; +use serde::{Deserialize, Serialize}; +use std::cell::RefCell; + +thread_local! { + static LOG_FILTER: RefCell = RefCell::default(); +} + +#[derive(Clone, Copy, Serialize, Deserialize, LogPriorityLevels)] +enum TestPriority { + #[log_level(capacity = 1000, name = "INFO_TEST")] + Info, +} + +impl GetLogFilter for TestPriority { + fn get_log_filter() -> LogFilter { + LOG_FILTER.with(|cell| cell.borrow().clone()) + } +} + +fn set_log_filter(filter: LogFilter) { + LOG_FILTER.set(filter); +} + +fn info_log_entry_with_timestamp(timestamp: u64) -> LogEntry { + LogEntry { + timestamp, + priority: TestPriority::Info, + file: String::default(), + line: 0, + message: String::default(), + counter: 0, + } +} + +fn is_ascending(log: &Log) -> bool { + for i in 0..log.entries.len() - 1 { + if log.entries[i].timestamp > log.entries[i + 1].timestamp { + return false; + } + } + true +} + +fn is_descending(log: &Log) -> bool { + for i in 0..log.entries.len() - 1 { + if log.entries[i].timestamp < log.entries[i + 1].timestamp { + return false; + } + } + true +} + +fn get_messages() -> Vec { + canlog::export_logs(TestPriority::Info.get_buffer()) + .into_iter() + .map(|entry| entry.message) + .collect() +} + +proptest! { + #[test] + fn logs_always_fit_in_message( + number_of_entries in 1..100_usize, + entry_size in 1..10000_usize, + max_body_size in 100..10000_usize + ) { + let mut entries: Vec> = vec![]; + for _ in 0..number_of_entries { + entries.push(LogEntry { + timestamp: 0, + priority: TestPriority::Info, + file: String::default(), + line: 0, + message: "1".repeat(entry_size), + counter: 0, + }); + } + let log = Log { entries }; + let truncated_logs_json_len = log.serialize_logs(max_body_size).len(); + prop_assert!(truncated_logs_json_len <= max_body_size); + } +} + +#[test] +fn sorting_order() { + let mut log = Log { entries: vec![] }; + log.entries.push(info_log_entry_with_timestamp(2)); + log.entries.push(info_log_entry_with_timestamp(0)); + log.entries.push(info_log_entry_with_timestamp(1)); + + log.sort_logs(Sort::Ascending); + assert!(is_ascending(&log)); + + log.sort_logs(Sort::Descending); + assert!(is_descending(&log)); +} + +#[test] +fn simple_logs_truncation() { + let mut entries: Vec> = vec![]; + const MAX_BODY_SIZE: usize = 3_000_000; + + for _ in 0..10 { + entries.push(LogEntry { + timestamp: 0, + priority: TestPriority::Info, + file: String::default(), + line: 0, + message: String::default(), + counter: 0, + }); + } + let log = Log { + entries: entries.clone(), + }; + let small_len = serde_json::to_string(&log).unwrap_or_default().len(); + + entries.push(LogEntry { + timestamp: 0, + priority: TestPriority::Info, + file: String::default(), + line: 0, + message: "1".repeat(MAX_BODY_SIZE), + counter: 0, + }); + let log = Log { entries }; + let entries_json = serde_json::to_string(&log).unwrap_or_default(); + assert!(entries_json.len() > MAX_BODY_SIZE); + + let truncated_logs_json = log.serialize_logs(MAX_BODY_SIZE); + + assert_eq!(small_len, truncated_logs_json.len()); +} + +#[test] +fn one_entry_too_big() { + let mut entries: Vec> = vec![]; + const MAX_BODY_SIZE: usize = 3_000_000; + + entries.push(LogEntry { + timestamp: 0, + priority: TestPriority::Info, + file: String::default(), + line: 0, + message: "1".repeat(MAX_BODY_SIZE), + counter: 0, + }); + let log = Log { entries }; + let truncated_logs_json_len = log.serialize_logs(MAX_BODY_SIZE).len(); + assert!(truncated_logs_json_len < MAX_BODY_SIZE); + assert_eq!("{\"entries\":[]}", log.serialize_logs(MAX_BODY_SIZE)); +} + +#[test] +fn should_truncate_last_entry() { + let log_entries = vec![ + info_log_entry_with_timestamp(0), + info_log_entry_with_timestamp(1), + info_log_entry_with_timestamp(2), + ]; + let log_with_2_entries = Log { + entries: { + let mut entries = log_entries.clone(); + entries.pop(); + entries + }, + }; + let log_with_3_entries = Log { + entries: log_entries, + }; + + let serialized_log_with_2_entries = log_with_2_entries.serialize_logs(usize::MAX); + let serialized_log_with_3_entries = + log_with_3_entries.serialize_logs(serialized_log_with_2_entries.len()); + + assert_eq!(serialized_log_with_3_entries, serialized_log_with_2_entries); +} + +#[test] +fn should_show_all() { + set_log_filter(LogFilter::ShowAll); + log!(TestPriority::Info, "ABC"); + log!(TestPriority::Info, "123"); + log!(TestPriority::Info, "!@#"); + assert_eq!(get_messages(), vec!["ABC", "123", "!@#"]); +} + +#[test] +fn should_hide_all() { + set_log_filter(LogFilter::HideAll); + log!(TestPriority::Info, "ABC"); + log!(TestPriority::Info, "123"); + log!(TestPriority::Info, "!@#"); + assert_eq!(get_messages().len(), 0); +} + +#[test] +fn should_show_pattern() { + set_log_filter(LogFilter::ShowPattern("end$".into())); + log!(TestPriority::Info, "message"); + log!(TestPriority::Info, "message end"); + log!(TestPriority::Info, "end message"); + assert_eq!(get_messages(), vec!["message end"]); +} + +#[test] +fn should_hide_pattern_including_message_type() { + set_log_filter(LogFilter::ShowPattern("^INFO_TEST [^ ]* 123".into())); + log!(TestPriority::Info, "123"); + log!(TestPriority::Info, "INFO_TEST 123"); + log!(TestPriority::Info, ""); + log!(TestPriority::Info, "123456"); + assert_eq!(get_messages(), vec!["123", "123456"]); +} + +#[test] +fn should_hide_pattern() { + set_log_filter(LogFilter::HidePattern("[ABC]".into())); + log!(TestPriority::Info, "remove A"); + log!(TestPriority::Info, "...B..."); + log!(TestPriority::Info, "C"); + log!(TestPriority::Info, "message"); + assert_eq!(get_messages(), vec!["message"]); +} diff --git a/packages/canlog/src/types/mod.rs b/packages/canlog/src/types/mod.rs new file mode 100644 index 000000000000..256c0daeea7a --- /dev/null +++ b/packages/canlog/src/types/mod.rs @@ -0,0 +1,92 @@ +use candid::CandidType; +use regex::Regex; +use serde::{Deserialize, Serialize}; +use std::str::FromStr; + +/// A string used as a regex pattern. +#[derive(Clone, Debug, PartialEq, Eq, CandidType, Serialize, Deserialize)] +pub struct RegexString(pub String); + +impl From<&str> for RegexString { + fn from(value: &str) -> Self { + RegexString(value.to_string()) + } +} + +impl RegexString { + /// Compile the string into a regular expression. + /// + /// This is a relatively expensive operation that's currently not cached. + pub fn compile(&self) -> Result { + Regex::new(&self.0) + } + + /// Checks if the given string matches the compiled regex pattern. + /// + /// Returns `Ok(true)` if `value` matches, `Ok(false)` if not, or an error if the regex is invalid. + pub fn try_is_valid(&self, value: &str) -> Result { + Ok(self.compile()?.is_match(value)) + } +} + +/// A regex-based substitution with a pattern and replacement string. +#[derive(Clone, Debug, PartialEq, Eq, CandidType, Serialize, Deserialize)] +pub struct RegexSubstitution { + /// The pattern to be matched. + pub pattern: RegexString, + /// The string to replace occurrences [`pattern`] with. + pub replacement: String, +} + +/// Only log entries matching this filter will be recorded. +#[derive(Clone, Debug, Default, PartialEq, Eq, CandidType, Serialize, Deserialize)] +pub enum LogFilter { + /// All log entries are recorded. + #[default] + ShowAll, + /// No log entries are recorded. + HideAll, + /// Only log entries matching this regular expression are recorded. + ShowPattern(RegexString), + /// Only log entries not matching this regular expression are recorded. + HidePattern(RegexString), +} + +impl LogFilter { + /// Returns whether the given message matches the [`LogFilter`]. + pub fn is_match(&self, message: &str) -> bool { + match self { + Self::ShowAll => true, + Self::HideAll => false, + Self::ShowPattern(regex) => regex + .try_is_valid(message) + .expect("Invalid regex in ShowPattern log filter"), + Self::HidePattern(regex) => !regex + .try_is_valid(message) + .expect("Invalid regex in HidePattern log filter"), + } + } +} + +/// Defines a sorting order for log entries +#[derive(Copy, Clone, Debug, Deserialize, serde::Serialize)] +pub enum Sort { + /// Log entries are sorted in ascending chronological order, i.e. + /// from oldest to newest. + Ascending, + /// Log entries are sorted in descending chronological order, i.e. + /// from newest to oldest. + Descending, +} + +impl FromStr for Sort { + type Err = String; + + fn from_str(s: &str) -> Result { + match s.to_lowercase().as_str() { + "asc" => Ok(Sort::Ascending), + "desc" => Ok(Sort::Descending), + _ => Err("could not recognize sort order".to_string()), + } + } +} From d21081c6f8e07cd404f61e87cd71ccf42254025e Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 15:48:23 +0200 Subject: [PATCH 03/17] CODEOWNERS --- .github/CODEOWNERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 52408c431820..d1955ec136b1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -41,6 +41,8 @@ go_deps.bzl @dfinity/idx /publish/ @dfinity/idx # [Packages] +/packages/canlog/ @dfinity/cross-chain-team +/packages/canlog_derive/ @dfinity/cross-chain-team /packages/icrc-cbor/ @dfinity/finint @dfinity/cross-chain-team /packages/icrc-ledger-agent/ @dfinity/finint /packages/icrc-ledger-types/ @dfinity/finint From a45abf8490b5766b9194aaaea19f924dddeb5548 Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 15:52:11 +0200 Subject: [PATCH 04/17] fix License --- packages/canlog/LICENSE | 2 +- packages/canlog/NOTICE | 1 - packages/canlog_derive/LICENSE | 2 +- packages/canlog_derive/NOTICE | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) delete mode 120000 packages/canlog/NOTICE delete mode 120000 packages/canlog_derive/NOTICE diff --git a/packages/canlog/LICENSE b/packages/canlog/LICENSE index ea5b60640b01..c87d0654aa62 120000 --- a/packages/canlog/LICENSE +++ b/packages/canlog/LICENSE @@ -1 +1 @@ -../LICENSE \ No newline at end of file +../../licenses/Apache-2.0.txt \ No newline at end of file diff --git a/packages/canlog/NOTICE b/packages/canlog/NOTICE deleted file mode 120000 index 7e1b82f6e6a1..000000000000 --- a/packages/canlog/NOTICE +++ /dev/null @@ -1 +0,0 @@ -../NOTICE \ No newline at end of file diff --git a/packages/canlog_derive/LICENSE b/packages/canlog_derive/LICENSE index ea5b60640b01..c87d0654aa62 120000 --- a/packages/canlog_derive/LICENSE +++ b/packages/canlog_derive/LICENSE @@ -1 +1 @@ -../LICENSE \ No newline at end of file +../../licenses/Apache-2.0.txt \ No newline at end of file diff --git a/packages/canlog_derive/NOTICE b/packages/canlog_derive/NOTICE deleted file mode 120000 index 7e1b82f6e6a1..000000000000 --- a/packages/canlog_derive/NOTICE +++ /dev/null @@ -1 +0,0 @@ -../NOTICE \ No newline at end of file From 359c8d4c0b8f30ca86a238b35d67065f611b6957 Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 15:59:46 +0200 Subject: [PATCH 05/17] update README --- packages/canlog/README.md | 1 + packages/canlog_derive/README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/canlog/README.md b/packages/canlog/README.md index 601ac6113eaa..d81a4f83986b 100644 --- a/packages/canlog/README.md +++ b/packages/canlog/README.md @@ -1,2 +1,3 @@ # Crate `canlog` +See the crate [documentation](https://docs.rs/canlog). diff --git a/packages/canlog_derive/README.md b/packages/canlog_derive/README.md index 18aab6f04ef2..77291965dd87 100644 --- a/packages/canlog_derive/README.md +++ b/packages/canlog_derive/README.md @@ -1,2 +1,3 @@ # Crate `canlog_derive` +See the crate [documentation](https://docs.rs/canlog). From 400e16ebbea9fe77b8bcb58b6e15ea848da8580d Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 16:01:15 +0200 Subject: [PATCH 06/17] Add canlog and canlog_derive to root Cargo.toml --- Cargo.lock | 226 +++++++++++++++++------------- Cargo.toml | 2 + packages/canlog/Cargo.toml | 12 +- packages/canlog_derive/Cargo.toml | 10 +- 4 files changed, 139 insertions(+), 111 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc9eb8cb02a9..045bf1dff16d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -96,7 +96,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -214,7 +214,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -538,7 +538,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -580,7 +580,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", "synstructure", ] @@ -592,7 +592,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -760,7 +760,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -777,7 +777,7 @@ checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -832,7 +832,7 @@ checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -982,7 +982,7 @@ checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -1195,7 +1195,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -1520,7 +1520,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -1796,10 +1796,10 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f42a145ed2d10dce2191e1dcf30cfccfea9026660e143662ba5eec4017d5daa" dependencies = [ - "darling 0.20.10", + "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -1914,7 +1914,7 @@ dependencies = [ "lazy_static", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -1993,6 +1993,32 @@ dependencies = [ "tokio", ] +[[package]] +name = "canlog" +version = "0.1.0" +dependencies = [ + "candid", + "canlog_derive", + "ic-canister-log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ic-cdk 0.17.1", + "proptest 1.6.0", + "regex", + "serde", + "serde_json", +] + +[[package]] +name = "canlog_derive" +version = "0.1.0" +dependencies = [ + "canlog", + "darling 0.20.11", + "proc-macro2", + "quote", + "serde", + "syn 2.0.101", +] + [[package]] name = "cargo-platform" version = "0.1.9" @@ -2331,7 +2357,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2388,7 +2414,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3201,7 +3227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3270,7 +3296,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3376,12 +3402,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", + "darling_core 0.20.11", + "darling_macro 0.20.11", ] [[package]] @@ -3400,16 +3426,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3425,13 +3451,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "darling_core 0.20.10", + "darling_core 0.20.11", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3547,7 +3573,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3568,7 +3594,7 @@ checksum = "2cdc8d50f426189eef89dac62fabfa0abb27d5cc008f25bf4156a0203325becc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3579,7 +3605,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3592,7 +3618,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3612,7 +3638,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3848,7 +3874,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -4127,7 +4153,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -4140,7 +4166,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -4190,7 +4216,7 @@ checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -4792,7 +4818,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -6827,7 +6853,7 @@ dependencies = [ "quote", "serde", "serde_tokenstream 0.2.2", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -6840,7 +6866,7 @@ dependencies = [ "quote", "serde", "serde_tokenstream 0.2.2", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -15093,7 +15119,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -15185,7 +15211,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -15711,11 +15737,11 @@ version = "0.94.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7871f02c3c848b63fee3d2f2645bb4a3c0b68ee147badcddf1b0cf8fb5db87ad" dependencies = [ - "darling 0.20.10", + "darling 0.20.11", "proc-macro2", "quote", "serde_json", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -16274,7 +16300,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax 0.6.29", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -16692,7 +16718,7 @@ dependencies = [ "cfg-if 1.0.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -17259,7 +17285,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -17409,7 +17435,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -17928,7 +17954,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -18032,7 +18058,7 @@ dependencies = [ "phf_shared 0.11.3", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -18076,7 +18102,7 @@ checksum = "f6e859e6e5bd50440ab63c47e3ebabc90f26251f7c73c3d3e837b74a1cc3fa67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -18520,7 +18546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" dependencies = [ "proc-macro2", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -18598,9 +18624,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.93" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -18719,7 +18745,7 @@ checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -18759,7 +18785,7 @@ dependencies = [ "prost 0.12.6", "prost-types 0.12.6", "regex", - "syn 2.0.98", + "syn 2.0.101", "tempfile", ] @@ -18779,7 +18805,7 @@ dependencies = [ "prost 0.13.4", "prost-types 0.13.4", "regex", - "syn 2.0.98", + "syn 2.0.101", "tempfile", ] @@ -18793,7 +18819,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -18806,7 +18832,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -18994,9 +19020,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -20093,7 +20119,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.98", + "syn 2.0.101", "unicode-ident", ] @@ -20514,7 +20540,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -20548,7 +20574,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -20626,7 +20652,7 @@ checksum = "22f968c5ea23d555e670b449c1c5e7b2fc399fdaec1d304a17cd48e288abc107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -20861,7 +20887,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -20872,7 +20898,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -20915,7 +20941,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -20938,7 +20964,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -20997,10 +21023,10 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.10", + "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -21392,7 +21418,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -21688,7 +21714,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive 0.2.0", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -21700,7 +21726,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive 0.3.0", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -21711,7 +21737,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -21722,7 +21748,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -21744,7 +21770,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -21805,9 +21831,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.98" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", @@ -21859,7 +21885,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -22078,7 +22104,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta 0.2.0", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -22090,7 +22116,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta 0.3.0", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -22180,7 +22206,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -22191,7 +22217,7 @@ checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -22387,7 +22413,7 @@ checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -22427,7 +22453,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -22612,7 +22638,7 @@ dependencies = [ "prost-build 0.13.4", "prost-types 0.13.4", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -22782,7 +22808,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -23444,7 +23470,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", "wasm-bindgen-shared", ] @@ -23479,7 +23505,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -23770,7 +23796,7 @@ checksum = "5732a5c86efce7bca121a61d8c07875f6b85c1607aa86753b40f7f8bd9d3a780" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -24016,7 +24042,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -24027,7 +24053,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -24418,7 +24444,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", "synstructure", ] @@ -24449,7 +24475,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -24460,7 +24486,7 @@ checksum = "79f81d38d7a2ed52d8f034e62c568e111df9bf8aba2f7cf19ddc5bf7bd89d520" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -24480,7 +24506,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", "synstructure", ] @@ -24501,7 +24527,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -24523,7 +24549,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index e3b17dc04bc7..256e322f8e88 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,8 @@ [workspace] members = [ + "packages/canlog", + "packages/canlog_derive", "packages/icrc-cbor", "packages/icrc-ledger-agent", "packages/icrc-ledger-client", diff --git a/packages/canlog/Cargo.toml b/packages/canlog/Cargo.toml index ff0e982ca10c..7af378a973ef 100644 --- a/packages/canlog/Cargo.toml +++ b/packages/canlog/Cargo.toml @@ -2,18 +2,18 @@ name = "canlog" version = "0.1.0" description = "Crate for managing canister logs" -authors.workspace = true -edition.workspace = true -repository.workspace = true -homepage.workspace = true -license.workspace = true +license = "Apache-2.0" readme = "README.md" include = ["src", "Cargo.toml", "CHANGELOG.md", "LICENSE", "README.md"] +repository = "https://github.com/dfinity/ic" +authors.workspace = true +edition.workspace = true +documentation = "https://docs.rs/canlog" [dependencies] candid = { workspace = true } canlog_derive = { path = "../canlog_derive", optional = true } -ic-canister-log = { workspace = true } +ic-canister-log = "0.2.0" ic-cdk = { workspace = true } regex = { workspace = true } serde = { workspace = true } diff --git a/packages/canlog_derive/Cargo.toml b/packages/canlog_derive/Cargo.toml index bb2b76bd3766..ec44dcaf8852 100644 --- a/packages/canlog_derive/Cargo.toml +++ b/packages/canlog_derive/Cargo.toml @@ -2,13 +2,13 @@ name = "canlog_derive" version = "0.1.0" description = "Crate with macro definitions for the canlog crate" -authors.workspace = true -edition.workspace = true -repository.workspace = true -homepage.workspace = true -license.workspace = true +license = "Apache-2.0" readme = "README.md" include = ["src", "Cargo.toml", "CHANGELOG.md", "LICENSE", "README.md"] +repository = "https://github.com/dfinity/ic" +authors.workspace = true +edition.workspace = true +documentation = "https://docs.rs/canlog" [dependencies] syn = { version = "2.0.100", features = ["derive"] } From c3aecef8426b1248a0bf2ae4957e1d33a2fa1ef6 Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 16:20:03 +0200 Subject: [PATCH 07/17] added Bazel files --- bazel/external_crates.bzl | 3 +++ packages/canlog/BUILD.bazel | 42 ++++++++++++++++++++++++++++++ packages/canlog_derive/BUILD.bazel | 32 +++++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 packages/canlog/BUILD.bazel create mode 100644 packages/canlog_derive/BUILD.bazel diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl index 6938dc53bc6d..90e7cb5e30c6 100644 --- a/bazel/external_crates.bzl +++ b/bazel/external_crates.bzl @@ -439,6 +439,9 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable "cvt": crate.spec( version = "^0.1.1", ), + "darling": crate.spec( + version = "^0.20.11", + ), "dashmap": crate.spec( version = "^5.3.4", ), diff --git a/packages/canlog/BUILD.bazel b/packages/canlog/BUILD.bazel new file mode 100644 index 000000000000..b98b356320a4 --- /dev/null +++ b/packages/canlog/BUILD.bazel @@ -0,0 +1,42 @@ +load("@rules_rust//rust:defs.bzl", "rust_doc", "rust_doc_test", "rust_library", "rust_test", "rust_test_suite") + +package(default_visibility = ["//visibility:public"]) + +DEPENDENCIES = [ + # Keep sorted. + "//packages/canlog_derive", + "@crate_index//:candid", + "@crate_index//:ic-canister-log", + "@crate_index//:ic-cdk", + "@crate_index//:regex", + "@crate_index//:serde", + "@crate_index//:serde_json", +] + +DEV_DEPENDENCIES = [ + # Keep sorted. + "@crate_index//:proptest", + "//packages/canlog_derive", +] + +rust_library( + name = "canlog", + srcs = glob(["src/**/*.rs"]), + deps = DEPENDENCIES, +) + +rust_test( + name = "unit_tests", + crate = ":canlog", +) + +rust_doc( + name = "doc", + crate = ":canlog", +) + +rust_doc_test( + name = "doc_test", + crate = ":canlog", + deps = [":canlog"] + DEPENDENCIES + DEV_DEPENDENCIES, +) diff --git a/packages/canlog_derive/BUILD.bazel b/packages/canlog_derive/BUILD.bazel new file mode 100644 index 000000000000..f56db78d44de --- /dev/null +++ b/packages/canlog_derive/BUILD.bazel @@ -0,0 +1,32 @@ +load("@rules_rust//rust:defs.bzl", "rust_doc", "rust_doc_test", "rust_library", "rust_test", "rust_test_suite") + +package(default_visibility = ["//visibility:public"]) + +DEPENDENCIES = [ + # Keep sorted. + "@crate_index//:syn", + "@crate_index//:quote", + "@crate_index//:proc-macro2", + "@crate_index//:darling", +] + +DEV_DEPENDENCIES = [ + # Keep sorted. +] + +rust_library( + name = "canlog", + srcs = glob(["src/**/*.rs"]), + deps = DEPENDENCIES, +) + +rust_doc( + name = "doc", + crate = ":canlog_derive", +) + +rust_doc_test( + name = "doc_test", + crate = ":canlog_derive", + deps = [":canlog_derive"] + DEPENDENCIES + DEV_DEPENDENCIES, +) From 4a4044efff5957c86b48585c7cb58f85b7840135 Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 16:20:20 +0200 Subject: [PATCH 08/17] clean-up dependencies --- Cargo.lock | 2 -- packages/canlog_derive/Cargo.toml | 4 ---- 2 files changed, 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 045bf1dff16d..ee749235e814 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2011,11 +2011,9 @@ dependencies = [ name = "canlog_derive" version = "0.1.0" dependencies = [ - "canlog", "darling 0.20.11", "proc-macro2", "quote", - "serde", "syn 2.0.101", ] diff --git a/packages/canlog_derive/Cargo.toml b/packages/canlog_derive/Cargo.toml index ec44dcaf8852..1a617b7185d6 100644 --- a/packages/canlog_derive/Cargo.toml +++ b/packages/canlog_derive/Cargo.toml @@ -16,10 +16,6 @@ quote = "1.0.40" proc-macro2 = "1.0.94" darling = "0.20.11" -[dev-dependencies] -canlog = { path = "../canlog" } -serde = { workspace = true, features = ["derive"] } - [lib] proc-macro = true From 347b883be546745a8f28fb4d59daccc428494cc9 Mon Sep 17 00:00:00 2001 From: IDX GitHub Automation Date: Mon, 28 Apr 2025 14:33:25 +0000 Subject: [PATCH 09/17] Automatically updated Cargo*.lock --- Cargo.Bazel.Fuzzing.json.lock | 49 +++++++++++++++++++---------------- Cargo.Bazel.Fuzzing.toml.lock | 25 +++++++++--------- Cargo.Bazel.json.lock | 49 +++++++++++++++++++---------------- Cargo.Bazel.toml.lock | 25 +++++++++--------- 4 files changed, 80 insertions(+), 68 deletions(-) diff --git a/Cargo.Bazel.Fuzzing.json.lock b/Cargo.Bazel.Fuzzing.json.lock index 43b9a20b9986..68f8ebfe455e 100644 --- a/Cargo.Bazel.Fuzzing.json.lock +++ b/Cargo.Bazel.Fuzzing.json.lock @@ -1,5 +1,5 @@ { - "checksum": "a2be41318e296226d9a38f8f19888276d22557b95c923556bcb25fffb67f18c8", + "checksum": "05c94f1c0cbfe3fa93b065c81991075c633c1f2846affa6ee726f633dcc11673", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -10978,7 +10978,7 @@ "deps": { "common": [ { - "id": "darling 0.20.10", + "id": "darling 0.20.11", "target": "darling" }, { @@ -18727,14 +18727,14 @@ ], "license_file": "LICENSE" }, - "darling 0.20.10": { + "darling 0.20.11": { "name": "darling", - "version": "0.20.10", + "version": "0.20.11", "package_url": "https://github.com/TedDriggs/darling", "repository": { "Http": { - "url": "https://static.crates.io/crates/darling/0.20.10/download", - "sha256": "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" + "url": "https://static.crates.io/crates/darling/0.20.11/download", + "sha256": "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" } }, "targets": [ @@ -18766,7 +18766,7 @@ "deps": { "common": [ { - "id": "darling_core 0.20.10", + "id": "darling_core 0.20.11", "target": "darling_core" } ], @@ -18776,13 +18776,13 @@ "proc_macro_deps": { "common": [ { - "id": "darling_macro 0.20.10", + "id": "darling_macro 0.20.11", "target": "darling_macro" } ], "selects": {} }, - "version": "0.20.10" + "version": "0.20.11" }, "license": "MIT", "license_ids": [ @@ -18864,14 +18864,14 @@ ], "license_file": "LICENSE" }, - "darling_core 0.20.10": { + "darling_core 0.20.11": { "name": "darling_core", - "version": "0.20.10", + "version": "0.20.11", "package_url": "https://github.com/TedDriggs/darling", "repository": { "Http": { - "url": "https://static.crates.io/crates/darling_core/0.20.10/download", - "sha256": "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" + "url": "https://static.crates.io/crates/darling_core/0.20.11/download", + "sha256": "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" } }, "targets": [ @@ -18930,7 +18930,7 @@ "selects": {} }, "edition": "2021", - "version": "0.20.10" + "version": "0.20.11" }, "license": "MIT", "license_ids": [ @@ -18993,14 +18993,14 @@ ], "license_file": "LICENSE" }, - "darling_macro 0.20.10": { + "darling_macro 0.20.11": { "name": "darling_macro", - "version": "0.20.10", + "version": "0.20.11", "package_url": "https://github.com/TedDriggs/darling", "repository": { "Http": { - "url": "https://static.crates.io/crates/darling_macro/0.20.10/download", - "sha256": "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" + "url": "https://static.crates.io/crates/darling_macro/0.20.11/download", + "sha256": "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" } }, "targets": [ @@ -19025,7 +19025,7 @@ "deps": { "common": [ { - "id": "darling_core 0.20.10", + "id": "darling_core 0.20.11", "target": "darling_core" }, { @@ -19040,7 +19040,7 @@ "selects": {} }, "edition": "2021", - "version": "0.20.10" + "version": "0.20.11" }, "license": "MIT", "license_ids": [ @@ -20762,6 +20762,10 @@ "id": "cvt 0.1.2", "target": "cvt" }, + { + "id": "darling 0.20.11", + "target": "darling" + }, { "id": "dashmap 5.5.3", "target": "dashmap" @@ -40613,7 +40617,7 @@ "deps": { "common": [ { - "id": "darling 0.20.10", + "id": "darling 0.20.11", "target": "darling" }, { @@ -71569,7 +71573,7 @@ "deps": { "common": [ { - "id": "darling 0.20.10", + "id": "darling 0.20.11", "target": "darling" }, { @@ -94671,6 +94675,7 @@ "ctrlc 3.4.5", "curve25519-dalek 4.1.3", "cvt 0.1.2", + "darling 0.20.11", "dashmap 5.5.3", "dfx-core 0.1.3", "dyn-clone 1.0.14", diff --git a/Cargo.Bazel.Fuzzing.toml.lock b/Cargo.Bazel.Fuzzing.toml.lock index 0108366685c1..7cef3317c191 100644 --- a/Cargo.Bazel.Fuzzing.toml.lock +++ b/Cargo.Bazel.Fuzzing.toml.lock @@ -1865,7 +1865,7 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f42a145ed2d10dce2191e1dcf30cfccfea9026660e143662ba5eec4017d5daa" dependencies = [ - "darling 0.20.10", + "darling 0.20.11", "proc-macro2", "quote", "syn 2.0.87", @@ -3036,12 +3036,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", + "darling_core 0.20.11", + "darling_macro 0.20.11", ] [[package]] @@ -3060,9 +3060,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" dependencies = [ "fnv", "ident_case", @@ -3085,11 +3085,11 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "darling_core 0.20.10", + "darling_core 0.20.11", "quote", "syn 2.0.87", ] @@ -3424,6 +3424,7 @@ dependencies = [ "ctrlc", "curve25519-dalek", "cvt", + "darling 0.20.11", "dashmap 5.5.3", "dfx-core", "dyn-clone", @@ -6907,7 +6908,7 @@ version = "0.94.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7871f02c3c848b63fee3d2f2645bb4a3c0b68ee147badcddf1b0cf8fb5db87ad" dependencies = [ - "darling 0.20.10", + "darling 0.20.11", "proc-macro2", "quote", "serde_json", @@ -11292,7 +11293,7 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.10", + "darling 0.20.11", "proc-macro2", "quote", "syn 2.0.87", diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock index 9bc27b0d7422..e9f9f8047da7 100644 --- a/Cargo.Bazel.json.lock +++ b/Cargo.Bazel.json.lock @@ -1,5 +1,5 @@ { - "checksum": "855b70948da3429a2acec183717932660523401d7c1303422708a8226319ac49", + "checksum": "6aaf133eeef4e7520c37ef799dde01e822140153763391d583eca58129563a75", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -10895,7 +10895,7 @@ "deps": { "common": [ { - "id": "darling 0.20.10", + "id": "darling 0.20.11", "target": "darling" }, { @@ -18555,14 +18555,14 @@ ], "license_file": "LICENSE" }, - "darling 0.20.10": { + "darling 0.20.11": { "name": "darling", - "version": "0.20.10", + "version": "0.20.11", "package_url": "https://github.com/TedDriggs/darling", "repository": { "Http": { - "url": "https://static.crates.io/crates/darling/0.20.10/download", - "sha256": "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" + "url": "https://static.crates.io/crates/darling/0.20.11/download", + "sha256": "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" } }, "targets": [ @@ -18594,7 +18594,7 @@ "deps": { "common": [ { - "id": "darling_core 0.20.10", + "id": "darling_core 0.20.11", "target": "darling_core" } ], @@ -18604,13 +18604,13 @@ "proc_macro_deps": { "common": [ { - "id": "darling_macro 0.20.10", + "id": "darling_macro 0.20.11", "target": "darling_macro" } ], "selects": {} }, - "version": "0.20.10" + "version": "0.20.11" }, "license": "MIT", "license_ids": [ @@ -18692,14 +18692,14 @@ ], "license_file": "LICENSE" }, - "darling_core 0.20.10": { + "darling_core 0.20.11": { "name": "darling_core", - "version": "0.20.10", + "version": "0.20.11", "package_url": "https://github.com/TedDriggs/darling", "repository": { "Http": { - "url": "https://static.crates.io/crates/darling_core/0.20.10/download", - "sha256": "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" + "url": "https://static.crates.io/crates/darling_core/0.20.11/download", + "sha256": "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" } }, "targets": [ @@ -18758,7 +18758,7 @@ "selects": {} }, "edition": "2021", - "version": "0.20.10" + "version": "0.20.11" }, "license": "MIT", "license_ids": [ @@ -18821,14 +18821,14 @@ ], "license_file": "LICENSE" }, - "darling_macro 0.20.10": { + "darling_macro 0.20.11": { "name": "darling_macro", - "version": "0.20.10", + "version": "0.20.11", "package_url": "https://github.com/TedDriggs/darling", "repository": { "Http": { - "url": "https://static.crates.io/crates/darling_macro/0.20.10/download", - "sha256": "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" + "url": "https://static.crates.io/crates/darling_macro/0.20.11/download", + "sha256": "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" } }, "targets": [ @@ -18853,7 +18853,7 @@ "deps": { "common": [ { - "id": "darling_core 0.20.10", + "id": "darling_core 0.20.11", "target": "darling_core" }, { @@ -18868,7 +18868,7 @@ "selects": {} }, "edition": "2021", - "version": "0.20.10" + "version": "0.20.11" }, "license": "MIT", "license_ids": [ @@ -20590,6 +20590,10 @@ "id": "cvt 0.1.2", "target": "cvt" }, + { + "id": "darling 0.20.11", + "target": "darling" + }, { "id": "dashmap 5.5.0", "target": "dashmap" @@ -40447,7 +40451,7 @@ "deps": { "common": [ { - "id": "darling 0.20.10", + "id": "darling 0.20.11", "target": "darling" }, { @@ -71448,7 +71452,7 @@ "deps": { "common": [ { - "id": "darling 0.20.10", + "id": "darling 0.20.11", "target": "darling" }, { @@ -94584,6 +94588,7 @@ "ctrlc 3.4.5", "curve25519-dalek 4.1.3", "cvt 0.1.2", + "darling 0.20.11", "dashmap 5.5.0", "dfx-core 0.1.3", "dyn-clone 1.0.14", diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock index 3dd1a700a28e..65e25e2754fc 100644 --- a/Cargo.Bazel.toml.lock +++ b/Cargo.Bazel.toml.lock @@ -1866,7 +1866,7 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f42a145ed2d10dce2191e1dcf30cfccfea9026660e143662ba5eec4017d5daa" dependencies = [ - "darling 0.20.10", + "darling 0.20.11", "proc-macro2", "quote", "syn 2.0.87", @@ -3025,12 +3025,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", + "darling_core 0.20.11", + "darling_macro 0.20.11", ] [[package]] @@ -3049,9 +3049,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" dependencies = [ "fnv", "ident_case", @@ -3074,11 +3074,11 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "darling_core 0.20.10", + "darling_core 0.20.11", "quote", "syn 2.0.87", ] @@ -3413,6 +3413,7 @@ dependencies = [ "ctrlc", "curve25519-dalek", "cvt", + "darling 0.20.11", "dashmap 5.5.0", "dfx-core", "dyn-clone", @@ -6897,7 +6898,7 @@ version = "0.94.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7871f02c3c848b63fee3d2f2645bb4a3c0b68ee147badcddf1b0cf8fb5db87ad" dependencies = [ - "darling 0.20.10", + "darling 0.20.11", "proc-macro2", "quote", "serde_json", @@ -11288,7 +11289,7 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.10", + "darling 0.20.11", "proc-macro2", "quote", "syn 2.0.87", From 7ad910ca80a5811ff07d9861465bcc752a2a5b18 Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 16:43:37 +0200 Subject: [PATCH 10/17] fix Bazel file --- packages/canlog_derive/BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/canlog_derive/BUILD.bazel b/packages/canlog_derive/BUILD.bazel index f56db78d44de..7e45a33814ff 100644 --- a/packages/canlog_derive/BUILD.bazel +++ b/packages/canlog_derive/BUILD.bazel @@ -15,7 +15,7 @@ DEV_DEPENDENCIES = [ ] rust_library( - name = "canlog", + name = "canlog_derive", srcs = glob(["src/**/*.rs"]), deps = DEPENDENCIES, ) From 105af5d27e4b28ef25b1016364173ea6d239a016 Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 16:43:47 +0200 Subject: [PATCH 11/17] set version to be able to publish --- packages/canlog/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/canlog/Cargo.toml b/packages/canlog/Cargo.toml index 7af378a973ef..ec29e689a802 100644 --- a/packages/canlog/Cargo.toml +++ b/packages/canlog/Cargo.toml @@ -12,7 +12,7 @@ documentation = "https://docs.rs/canlog" [dependencies] candid = { workspace = true } -canlog_derive = { path = "../canlog_derive", optional = true } +canlog_derive = { version = "=0.1.0", path = "../canlog_derive", optional = true } ic-canister-log = "0.2.0" ic-cdk = { workspace = true } regex = { workspace = true } From 0872c6807322a47009beb55c1781bc823351fdce Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 16:53:23 +0200 Subject: [PATCH 12/17] use syn2 --- bazel/external_crates.bzl | 3 +++ packages/canlog_derive/BUILD.bazel | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl index 90e7cb5e30c6..6543b8a88505 100644 --- a/bazel/external_crates.bzl +++ b/bazel/external_crates.bzl @@ -1283,6 +1283,9 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable "full", ], ), + "syn2": crate.spec( + version = "^2.0.101", + ), "syscalls": crate.spec( version = "^0.6.18", ), diff --git a/packages/canlog_derive/BUILD.bazel b/packages/canlog_derive/BUILD.bazel index 7e45a33814ff..05f2e9818913 100644 --- a/packages/canlog_derive/BUILD.bazel +++ b/packages/canlog_derive/BUILD.bazel @@ -1,10 +1,10 @@ -load("@rules_rust//rust:defs.bzl", "rust_doc", "rust_doc_test", "rust_library", "rust_test", "rust_test_suite") +load("@rules_rust//rust:defs.bzl", "rust_doc", "rust_doc_test", "rust_library", "rust_proc_macro", "rust_test", "rust_test_suite") package(default_visibility = ["//visibility:public"]) DEPENDENCIES = [ # Keep sorted. - "@crate_index//:syn", + "@crate_index//:syn2", "@crate_index//:quote", "@crate_index//:proc-macro2", "@crate_index//:darling", @@ -14,7 +14,7 @@ DEV_DEPENDENCIES = [ # Keep sorted. ] -rust_library( +rust_proc_macro( name = "canlog_derive", srcs = glob(["src/**/*.rs"]), deps = DEPENDENCIES, From afee6c8d7195fdc240aa747e68a1e6d47b4f4194 Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 17:18:42 +0200 Subject: [PATCH 13/17] fix --- bazel/external_crates.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl index 6543b8a88505..3691a697dcc2 100644 --- a/bazel/external_crates.bzl +++ b/bazel/external_crates.bzl @@ -1284,6 +1284,7 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable ], ), "syn2": crate.spec( + package = "syn", version = "^2.0.101", ), "syscalls": crate.spec( From 9a73f2f86074df6479a4de1d97a470927b7ad5bd Mon Sep 17 00:00:00 2001 From: IDX GitHub Automation Date: Mon, 28 Apr 2025 15:31:28 +0000 Subject: [PATCH 14/17] Automatically updated Cargo*.lock --- Cargo.Bazel.Fuzzing.json.lock | 400 +++++++++++++++++----------------- Cargo.Bazel.Fuzzing.toml.lock | 161 +++++++------- Cargo.Bazel.json.lock | 398 ++++++++++++++++----------------- Cargo.Bazel.toml.lock | 159 +++++++------- 4 files changed, 566 insertions(+), 552 deletions(-) diff --git a/Cargo.Bazel.Fuzzing.json.lock b/Cargo.Bazel.Fuzzing.json.lock index 68f8ebfe455e..28c010f29e32 100644 --- a/Cargo.Bazel.Fuzzing.json.lock +++ b/Cargo.Bazel.Fuzzing.json.lock @@ -1,5 +1,5 @@ { - "checksum": "05c94f1c0cbfe3fa93b065c81991075c633c1f2846affa6ee726f633dcc11673", + "checksum": "d643df893831324342c0f500d0c685293673fdf0ab2cf4e0d4709ad723fb043c", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -462,7 +462,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -1068,7 +1068,7 @@ "target": "actix_router" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -1076,7 +1076,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -3126,7 +3126,7 @@ "target": "mime_guess" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -3138,7 +3138,7 @@ "target": "serde" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -3369,7 +3369,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -3377,7 +3377,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -3429,7 +3429,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -3437,7 +3437,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -4165,7 +4165,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -4173,7 +4173,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -4396,7 +4396,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -4404,7 +4404,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -4497,7 +4497,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -4505,7 +4505,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -4796,7 +4796,7 @@ "target": "proc_macro_error" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -5604,7 +5604,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -5612,7 +5612,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -5665,7 +5665,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -5673,7 +5673,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -6995,7 +6995,7 @@ "target": "prettyplease" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -7015,7 +7015,7 @@ "target": "shlex" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -7129,7 +7129,7 @@ "target": "lazycell" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -7149,7 +7149,7 @@ "target": "shlex" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -7292,7 +7292,7 @@ "target": "either" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -9182,7 +9182,7 @@ "target": "proc_macro_crate" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -9190,7 +9190,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -9998,7 +9998,7 @@ "target": "proc_macro_error" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -10350,7 +10350,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -10982,7 +10982,7 @@ "target": "darling" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -10990,7 +10990,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -11329,7 +11329,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -11531,7 +11531,7 @@ "target": "lazy_static" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -11539,7 +11539,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -13727,7 +13727,7 @@ "target": "proc_macro_error" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -13793,7 +13793,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -13801,7 +13801,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -14085,7 +14085,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -14097,7 +14097,7 @@ "target": "serde_derive_internals" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -14661,7 +14661,7 @@ "target": "convert_case" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -14721,7 +14721,7 @@ "target": "convert_case" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -18108,7 +18108,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -18522,7 +18522,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -18530,7 +18530,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -18837,7 +18837,7 @@ "target": "ident_case" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -18911,7 +18911,7 @@ "target": "ident_case" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -18923,7 +18923,7 @@ "target": "strsim" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -19033,7 +19033,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -19708,7 +19708,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -19716,7 +19716,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -19832,7 +19832,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -19840,7 +19840,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -19887,7 +19887,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -19895,7 +19895,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -19978,7 +19978,7 @@ "target": "convert_case" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -21292,7 +21292,7 @@ "target": "priority_queue" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -21588,6 +21588,11 @@ "id": "syn 1.0.109", "target": "syn" }, + { + "id": "syn 2.0.101", + "target": "syn", + "alias": "syn2" + }, { "id": "syscalls 0.6.18", "target": "syscalls" @@ -22219,7 +22224,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -22227,7 +22232,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -23070,7 +23075,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -23642,7 +23647,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -23702,7 +23707,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -23710,7 +23715,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -23766,7 +23771,7 @@ "target": "num_traits" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -23774,7 +23779,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -24110,7 +24115,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -24118,7 +24123,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -27709,7 +27714,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -27717,7 +27722,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -31206,7 +31211,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -33681,7 +33686,7 @@ "target": "candid" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -33748,7 +33753,7 @@ "target": "candid" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -33764,7 +33769,7 @@ "target": "serde_tokenstream" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -33818,7 +33823,7 @@ "target": "candid" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -33834,7 +33839,7 @@ "target": "serde_tokenstream" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -36838,7 +36843,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -36846,7 +36851,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -37458,7 +37463,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -40621,7 +40626,7 @@ "target": "darling" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -40633,7 +40638,7 @@ "target": "serde_json" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -43936,7 +43941,7 @@ "target": "fnv" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -43948,7 +43953,7 @@ "target": "regex_syntax" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -44004,7 +44009,7 @@ "target": "fnv" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -45824,7 +45829,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -46436,7 +46441,7 @@ "target": "build_script_build" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -46444,7 +46449,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -47046,7 +47051,7 @@ "target": "either" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -48849,7 +48854,7 @@ "target": "proc_macro_crate" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -48857,7 +48862,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -49608,7 +49613,7 @@ "target": "bytes" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -49838,7 +49843,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -49846,7 +49851,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -51776,7 +51781,7 @@ "target": "proc_macro_crate" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -53038,7 +53043,7 @@ "target": "pest_meta" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -53046,7 +53051,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -53536,7 +53541,7 @@ "target": "phf_shared" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -53544,7 +53549,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -53784,7 +53789,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -53792,7 +53797,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -55660,11 +55665,11 @@ "target": "build_script_build" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -56069,7 +56074,7 @@ "target": "build_script_build" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -56167,7 +56172,7 @@ "target": "build_script_build" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -56272,14 +56277,14 @@ ], "license_file": "LICENSE-APACHE" }, - "proc-macro2 1.0.89": { + "proc-macro2 1.0.95": { "name": "proc-macro2", - "version": "1.0.89", + "version": "1.0.95", "package_url": "https://github.com/dtolnay/proc-macro2", "repository": { "Http": { - "url": "https://static.crates.io/crates/proc-macro2/1.0.89/download", - "sha256": "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" + "url": "https://static.crates.io/crates/proc-macro2/1.0.95/download", + "sha256": "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" } }, "targets": [ @@ -56323,7 +56328,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "build_script_build" }, { @@ -56334,7 +56339,7 @@ "selects": {} }, "edition": "2021", - "version": "1.0.89" + "version": "1.0.95" }, "build_script_attrs": { "compile_data_glob": [ @@ -56920,7 +56925,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -56928,7 +56933,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -57158,7 +57163,7 @@ "target": "regex" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -57264,7 +57269,7 @@ "target": "regex" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -57323,7 +57328,7 @@ "target": "itertools" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -57331,7 +57336,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -57386,7 +57391,7 @@ "target": "itertools" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -57394,7 +57399,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -57772,7 +57777,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -58535,7 +58540,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" } ], @@ -60153,7 +60158,7 @@ "target": "itertools" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -65336,7 +65341,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -65500,7 +65505,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -65856,7 +65861,7 @@ "target": "glob" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -65876,7 +65881,7 @@ "target": "build_script_build" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -68730,7 +68735,7 @@ "target": "proc_macro_crate" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -68935,7 +68940,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -68947,7 +68952,7 @@ "target": "serde_derive_internals" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -69296,7 +69301,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -69304,7 +69309,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -70836,7 +70841,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -70844,7 +70849,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -70892,7 +70897,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -70900,7 +70905,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -71147,7 +71152,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -71155,7 +71160,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -71203,7 +71208,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -71258,7 +71263,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -71270,7 +71275,7 @@ "target": "serde" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -71517,7 +71522,7 @@ "target": "darling" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -71577,7 +71582,7 @@ "target": "darling" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -71585,7 +71590,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -73861,7 +73866,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -73927,7 +73932,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -73935,7 +73940,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -74945,7 +74950,7 @@ "target": "phf_shared" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -75073,7 +75078,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -75081,7 +75086,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -75138,7 +75143,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -75146,7 +75151,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -75310,7 +75315,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -75318,7 +75323,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -75378,7 +75383,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -75386,7 +75391,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -75819,7 +75824,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -75855,14 +75860,14 @@ ], "license_file": "LICENSE-APACHE" }, - "syn 2.0.87": { + "syn 2.0.101": { "name": "syn", - "version": "2.0.87", + "version": "2.0.101", "package_url": "https://github.com/dtolnay/syn", "repository": { "Http": { - "url": "https://static.crates.io/crates/syn/2.0.87/download", - "sha256": "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" + "url": "https://static.crates.io/crates/syn/2.0.101/download", + "sha256": "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" } }, "targets": [ @@ -75958,7 +75963,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -75973,7 +75978,7 @@ "selects": {} }, "edition": "2021", - "version": "2.0.87" + "version": "2.0.101" }, "license": "MIT OR Apache-2.0", "license_ids": [ @@ -76113,7 +76118,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -76121,7 +76126,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -77121,7 +77126,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -77625,7 +77630,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -77637,7 +77642,7 @@ "target": "structmeta" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -77991,7 +77996,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -77999,7 +78004,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -78047,7 +78052,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -78055,7 +78060,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -79391,7 +79396,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -79399,7 +79404,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -80007,7 +80012,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -80015,7 +80020,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -81147,7 +81152,7 @@ "target": "prettyplease" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -81163,7 +81168,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -82106,7 +82111,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -82114,7 +82119,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -85303,7 +85308,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -85754,7 +85759,7 @@ "target": "log" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -85762,7 +85767,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -85929,7 +85934,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -85937,7 +85942,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -88036,7 +88041,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -88044,7 +88049,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -92656,7 +92661,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -92664,7 +92669,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -92858,7 +92863,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -92866,7 +92871,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -92915,7 +92920,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -92923,7 +92928,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -93026,7 +93031,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -93034,7 +93039,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -93142,7 +93147,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -93150,7 +93155,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -93265,7 +93270,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -93273,7 +93278,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -94813,7 +94818,7 @@ "pretty-bytes 0.2.2", "pretty_assertions 1.4.0", "priority-queue 1.3.2", - "proc-macro2 1.0.89", + "proc-macro2 1.0.95", "procfs 0.9.1", "prometheus 0.13.4", "prometheus-parse 0.2.4", @@ -94891,6 +94896,7 @@ "stubborn-io 0.3.2", "subtle 2.6.1", "syn 1.0.109", + "syn 2.0.101", "syscalls 0.6.18", "tar 0.4.39", "tarpc 0.34.0", diff --git a/Cargo.Bazel.Fuzzing.toml.lock b/Cargo.Bazel.Fuzzing.toml.lock index 7cef3317c191..9b6a91211cca 100644 --- a/Cargo.Bazel.Fuzzing.toml.lock +++ b/Cargo.Bazel.Fuzzing.toml.lock @@ -96,7 +96,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -214,7 +214,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -546,7 +546,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -588,7 +588,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", "synstructure", ] @@ -600,7 +600,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -736,7 +736,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -779,7 +779,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -796,7 +796,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1011,7 +1011,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1022,7 +1022,7 @@ checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1235,7 +1235,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1255,7 +1255,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1568,7 +1568,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1868,7 +1868,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1963,7 +1963,7 @@ dependencies = [ "lazy_static", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -2251,7 +2251,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -2308,7 +2308,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -2930,7 +2930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -2999,7 +2999,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3069,7 +3069,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3091,7 +3091,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3213,7 +3213,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3234,7 +3234,7 @@ checksum = "2cdc8d50f426189eef89dac62fabfa0abb27d5cc008f25bf4156a0203325becc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3245,7 +3245,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3640,6 +3640,7 @@ dependencies = [ "stubborn-io", "subtle", "syn 1.0.109", + "syn 2.0.101", "syscalls", "tar", "tarpc", @@ -3764,7 +3765,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -4010,7 +4011,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -4023,7 +4024,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -4083,7 +4084,7 @@ checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -4610,7 +4611,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -5696,7 +5697,7 @@ dependencies = [ "quote", "serde", "serde_tokenstream 0.2.1", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -5709,7 +5710,7 @@ dependencies = [ "quote", "serde", "serde_tokenstream 0.2.1", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -6287,7 +6288,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -6912,7 +6913,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -7359,7 +7360,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax 0.6.29", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -7738,7 +7739,7 @@ dependencies = [ "cfg-if 1.0.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -8115,7 +8116,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -8270,7 +8271,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -8810,7 +8811,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -8903,7 +8904,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -8947,7 +8948,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -9268,7 +9269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -9356,9 +9357,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -9457,7 +9458,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -9497,7 +9498,7 @@ dependencies = [ "prost 0.12.2", "prost-types 0.12.2", "regex", - "syn 2.0.87", + "syn 2.0.101", "tempfile", "which", ] @@ -9519,7 +9520,7 @@ dependencies = [ "prost 0.13.3", "prost-types 0.13.3", "regex", - "syn 2.0.87", + "syn 2.0.101", "tempfile", ] @@ -9533,7 +9534,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -9546,7 +9547,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -10483,7 +10484,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.87", + "syn 2.0.101", "unicode-ident", ] @@ -10859,7 +10860,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -10921,7 +10922,7 @@ checksum = "22f968c5ea23d555e670b449c1c5e7b2fc399fdaec1d304a17cd48e288abc107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11157,7 +11158,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11168,7 +11169,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11211,7 +11212,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11234,7 +11235,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11296,7 +11297,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11676,7 +11677,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11869,7 +11870,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11880,7 +11881,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11911,7 +11912,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11924,7 +11925,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11985,9 +11986,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", @@ -12017,7 +12018,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12244,7 +12245,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12300,7 +12301,7 @@ checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12311,7 +12312,7 @@ checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12484,7 +12485,7 @@ checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12524,7 +12525,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12730,7 +12731,7 @@ dependencies = [ "prost-build 0.13.3", "prost-types 0.13.3", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12901,7 +12902,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -13512,7 +13513,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", "wasm-bindgen-shared", ] @@ -13546,7 +13547,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -13861,7 +13862,7 @@ checksum = "5732a5c86efce7bca121a61d8c07875f6b85c1607aa86753b40f7f8bd9d3a780" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -14482,7 +14483,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", "synstructure", ] @@ -14512,7 +14513,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -14523,7 +14524,7 @@ checksum = "79f81d38d7a2ed52d8f034e62c568e111df9bf8aba2f7cf19ddc5bf7bd89d520" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -14543,7 +14544,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", "synstructure", ] @@ -14564,7 +14565,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -14586,7 +14587,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock index e9f9f8047da7..12f326119924 100644 --- a/Cargo.Bazel.json.lock +++ b/Cargo.Bazel.json.lock @@ -1,5 +1,5 @@ { - "checksum": "6aaf133eeef4e7520c37ef799dde01e822140153763391d583eca58129563a75", + "checksum": "cfd57dd2deeb7d2e38a58449f0c024519789240e33244e6cb8a98736b61ebe1a", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -1072,7 +1072,7 @@ "target": "actix_router" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -1080,7 +1080,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -3130,7 +3130,7 @@ "target": "mime_guess" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -3142,7 +3142,7 @@ "target": "serde" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -3373,7 +3373,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -3381,7 +3381,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -3433,7 +3433,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -3441,7 +3441,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -4169,7 +4169,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -4177,7 +4177,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -4400,7 +4400,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -4408,7 +4408,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -4501,7 +4501,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -4509,7 +4509,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -4800,7 +4800,7 @@ "target": "proc_macro_error" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -5608,7 +5608,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -5616,7 +5616,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -5669,7 +5669,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -5677,7 +5677,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -6975,7 +6975,7 @@ "target": "prettyplease" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -6995,7 +6995,7 @@ "target": "shlex" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -7109,7 +7109,7 @@ "target": "lazycell" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -7129,7 +7129,7 @@ "target": "shlex" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -7272,7 +7272,7 @@ "target": "either" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -9099,7 +9099,7 @@ "target": "proc_macro_crate" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -9107,7 +9107,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -9915,7 +9915,7 @@ "target": "proc_macro_error" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -10267,7 +10267,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -10899,7 +10899,7 @@ "target": "darling" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -10907,7 +10907,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -11246,7 +11246,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -11427,7 +11427,7 @@ "target": "lazy_static" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -11435,7 +11435,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -13623,7 +13623,7 @@ "target": "proc_macro_error" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -13689,7 +13689,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -13697,7 +13697,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -13981,7 +13981,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -13993,7 +13993,7 @@ "target": "serde_derive_internals" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -14557,7 +14557,7 @@ "target": "convert_case" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -14617,7 +14617,7 @@ "target": "convert_case" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -17936,7 +17936,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -18350,7 +18350,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -18358,7 +18358,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -18665,7 +18665,7 @@ "target": "ident_case" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -18739,7 +18739,7 @@ "target": "ident_case" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -18751,7 +18751,7 @@ "target": "strsim" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -18861,7 +18861,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -19536,7 +19536,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -19544,7 +19544,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -19660,7 +19660,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -19668,7 +19668,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -19715,7 +19715,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -19723,7 +19723,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -19806,7 +19806,7 @@ "target": "convert_case" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -21120,7 +21120,7 @@ "target": "priority_queue" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -21416,6 +21416,11 @@ "id": "syn 1.0.109", "target": "syn" }, + { + "id": "syn 2.0.101", + "target": "syn", + "alias": "syn2" + }, { "id": "syscalls 0.6.18", "target": "syscalls" @@ -22047,7 +22052,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -22055,7 +22060,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -22898,7 +22903,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -23470,7 +23475,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -23530,7 +23535,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -23538,7 +23543,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -23594,7 +23599,7 @@ "target": "num_traits" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -23602,7 +23607,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -23938,7 +23943,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -23946,7 +23951,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -27560,7 +27565,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -27568,7 +27573,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -31061,7 +31066,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -33536,7 +33541,7 @@ "target": "candid" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -33603,7 +33608,7 @@ "target": "candid" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -33619,7 +33624,7 @@ "target": "serde_tokenstream" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -33673,7 +33678,7 @@ "target": "candid" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -33689,7 +33694,7 @@ "target": "serde_tokenstream" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -36672,7 +36677,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -36680,7 +36685,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -37292,7 +37297,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -40455,7 +40460,7 @@ "target": "darling" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -40467,7 +40472,7 @@ "target": "serde_json" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -43777,7 +43782,7 @@ "target": "fnv" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -43789,7 +43794,7 @@ "target": "regex_syntax" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -43845,7 +43850,7 @@ "target": "fnv" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -45664,7 +45669,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -46276,7 +46281,7 @@ "target": "build_script_build" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -46284,7 +46289,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -46886,7 +46891,7 @@ "target": "either" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -48689,7 +48694,7 @@ "target": "proc_macro_crate" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -48697,7 +48702,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -49448,7 +49453,7 @@ "target": "bytes" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -49678,7 +49683,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -49686,7 +49691,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -51616,7 +51621,7 @@ "target": "proc_macro_crate" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -52873,7 +52878,7 @@ "target": "pest_meta" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -52881,7 +52886,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -53371,7 +53376,7 @@ "target": "phf_shared" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -53379,7 +53384,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -53619,7 +53624,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -53627,7 +53632,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -55495,11 +55500,11 @@ "target": "build_script_build" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -55904,7 +55909,7 @@ "target": "build_script_build" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -56002,7 +56007,7 @@ "target": "build_script_build" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -56107,14 +56112,14 @@ ], "license_file": "LICENSE-APACHE" }, - "proc-macro2 1.0.89": { + "proc-macro2 1.0.95": { "name": "proc-macro2", - "version": "1.0.89", + "version": "1.0.95", "package_url": "https://github.com/dtolnay/proc-macro2", "repository": { "Http": { - "url": "https://static.crates.io/crates/proc-macro2/1.0.89/download", - "sha256": "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" + "url": "https://static.crates.io/crates/proc-macro2/1.0.95/download", + "sha256": "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" } }, "targets": [ @@ -56158,7 +56163,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "build_script_build" }, { @@ -56169,7 +56174,7 @@ "selects": {} }, "edition": "2021", - "version": "1.0.89" + "version": "1.0.95" }, "build_script_attrs": { "compile_data_glob": [ @@ -56755,7 +56760,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -56763,7 +56768,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -56993,7 +56998,7 @@ "target": "regex" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -57099,7 +57104,7 @@ "target": "regex" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -57158,7 +57163,7 @@ "target": "itertools" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -57166,7 +57171,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -57221,7 +57226,7 @@ "target": "itertools" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -57229,7 +57234,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -57607,7 +57612,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -58370,7 +58375,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" } ], @@ -59988,7 +59993,7 @@ "target": "itertools" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -65215,7 +65220,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -65379,7 +65384,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -65735,7 +65740,7 @@ "target": "glob" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -65755,7 +65760,7 @@ "target": "build_script_build" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -68609,7 +68614,7 @@ "target": "proc_macro_crate" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -68814,7 +68819,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -68826,7 +68831,7 @@ "target": "serde_derive_internals" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -69175,7 +69180,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -69183,7 +69188,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -70715,7 +70720,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -70723,7 +70728,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -70771,7 +70776,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -70779,7 +70784,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -71026,7 +71031,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -71034,7 +71039,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -71082,7 +71087,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -71137,7 +71142,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -71149,7 +71154,7 @@ "target": "serde" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -71396,7 +71401,7 @@ "target": "darling" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -71456,7 +71461,7 @@ "target": "darling" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -71464,7 +71469,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -73740,7 +73745,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -73806,7 +73811,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -73814,7 +73819,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -74824,7 +74829,7 @@ "target": "phf_shared" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -74952,7 +74957,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -74960,7 +74965,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -75017,7 +75022,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -75025,7 +75030,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -75189,7 +75194,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -75197,7 +75202,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -75257,7 +75262,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -75265,7 +75270,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -75698,7 +75703,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -75734,14 +75739,14 @@ ], "license_file": "LICENSE-APACHE" }, - "syn 2.0.87": { + "syn 2.0.101": { "name": "syn", - "version": "2.0.87", + "version": "2.0.101", "package_url": "https://github.com/dtolnay/syn", "repository": { "Http": { - "url": "https://static.crates.io/crates/syn/2.0.87/download", - "sha256": "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" + "url": "https://static.crates.io/crates/syn/2.0.101/download", + "sha256": "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" } }, "targets": [ @@ -75837,7 +75842,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -75852,7 +75857,7 @@ "selects": {} }, "edition": "2021", - "version": "2.0.87" + "version": "2.0.101" }, "license": "MIT OR Apache-2.0", "license_ids": [ @@ -75992,7 +75997,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -76000,7 +76005,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -77000,7 +77005,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -77504,7 +77509,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -77516,7 +77521,7 @@ "target": "structmeta" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -77870,7 +77875,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -77878,7 +77883,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -77926,7 +77931,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -77934,7 +77939,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -79270,7 +79275,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -79278,7 +79283,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -79886,7 +79891,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -79894,7 +79899,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -81026,7 +81031,7 @@ "target": "prettyplease" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -81042,7 +81047,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -81985,7 +81990,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -81993,7 +81998,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -85182,7 +85187,7 @@ "target": "heck" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -85633,7 +85638,7 @@ "target": "log" }, { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -85641,7 +85646,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -85808,7 +85813,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -85816,7 +85821,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -87894,7 +87899,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -87902,7 +87907,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -92509,7 +92514,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -92517,7 +92522,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -92711,7 +92716,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -92719,7 +92724,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -92768,7 +92773,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -92776,7 +92781,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -92879,7 +92884,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -92887,7 +92892,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" }, { @@ -92995,7 +93000,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -93003,7 +93008,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -93118,7 +93123,7 @@ "deps": { "common": [ { - "id": "proc-macro2 1.0.89", + "id": "proc-macro2 1.0.95", "target": "proc_macro2" }, { @@ -93126,7 +93131,7 @@ "target": "quote" }, { - "id": "syn 2.0.87", + "id": "syn 2.0.101", "target": "syn" } ], @@ -94726,7 +94731,7 @@ "pretty-bytes 0.2.2", "pretty_assertions 1.4.0", "priority-queue 1.3.2", - "proc-macro2 1.0.89", + "proc-macro2 1.0.95", "procfs 0.9.1", "prometheus 0.13.4", "prometheus-parse 0.2.4", @@ -94804,6 +94809,7 @@ "stubborn-io 0.3.2", "subtle 2.6.1", "syn 1.0.109", + "syn 2.0.101", "syscalls 0.6.18", "tar 0.4.39", "tarpc 0.34.0", diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock index 65e25e2754fc..73c56f37c0bb 100644 --- a/Cargo.Bazel.toml.lock +++ b/Cargo.Bazel.toml.lock @@ -215,7 +215,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -547,7 +547,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -589,7 +589,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", "synstructure", ] @@ -601,7 +601,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -737,7 +737,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -780,7 +780,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -797,7 +797,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1012,7 +1012,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1023,7 +1023,7 @@ checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1236,7 +1236,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1256,7 +1256,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1569,7 +1569,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1869,7 +1869,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -1964,7 +1964,7 @@ dependencies = [ "lazy_static", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -2252,7 +2252,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -2309,7 +2309,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -2919,7 +2919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -2988,7 +2988,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3058,7 +3058,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3080,7 +3080,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3202,7 +3202,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3223,7 +3223,7 @@ checksum = "2cdc8d50f426189eef89dac62fabfa0abb27d5cc008f25bf4156a0203325becc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3234,7 +3234,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3629,6 +3629,7 @@ dependencies = [ "stubborn-io", "subtle", "syn 1.0.109", + "syn 2.0.101", "syscalls", "tar", "tarpc", @@ -3753,7 +3754,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -3999,7 +4000,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -4012,7 +4013,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -4072,7 +4073,7 @@ checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -4599,7 +4600,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -5686,7 +5687,7 @@ dependencies = [ "quote", "serde", "serde_tokenstream 0.2.1", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -5699,7 +5700,7 @@ dependencies = [ "quote", "serde", "serde_tokenstream 0.2.1", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -6277,7 +6278,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -6902,7 +6903,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -7350,7 +7351,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax 0.6.29", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -7729,7 +7730,7 @@ dependencies = [ "cfg-if 1.0.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -8106,7 +8107,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -8261,7 +8262,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -8800,7 +8801,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -8893,7 +8894,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -8937,7 +8938,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -9258,7 +9259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -9346,9 +9347,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -9447,7 +9448,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -9487,7 +9488,7 @@ dependencies = [ "prost 0.12.2", "prost-types 0.12.2", "regex", - "syn 2.0.87", + "syn 2.0.101", "tempfile", "which", ] @@ -9509,7 +9510,7 @@ dependencies = [ "prost 0.13.3", "prost-types 0.13.3", "regex", - "syn 2.0.87", + "syn 2.0.101", "tempfile", ] @@ -9523,7 +9524,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -9536,7 +9537,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -10479,7 +10480,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.87", + "syn 2.0.101", "unicode-ident", ] @@ -10855,7 +10856,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -10917,7 +10918,7 @@ checksum = "22f968c5ea23d555e670b449c1c5e7b2fc399fdaec1d304a17cd48e288abc107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11153,7 +11154,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11164,7 +11165,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11207,7 +11208,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11230,7 +11231,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11292,7 +11293,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11672,7 +11673,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11865,7 +11866,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11876,7 +11877,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11907,7 +11908,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11920,7 +11921,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -11981,9 +11982,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", @@ -12013,7 +12014,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12240,7 +12241,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12296,7 +12297,7 @@ checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12307,7 +12308,7 @@ checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12480,7 +12481,7 @@ checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12520,7 +12521,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12726,7 +12727,7 @@ dependencies = [ "prost-build 0.13.3", "prost-types 0.13.3", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -12897,7 +12898,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -13508,7 +13509,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", "wasm-bindgen-shared", ] @@ -13542,7 +13543,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -13857,7 +13858,7 @@ checksum = "5732a5c86efce7bca121a61d8c07875f6b85c1607aa86753b40f7f8bd9d3a780" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -14477,7 +14478,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", "synstructure", ] @@ -14507,7 +14508,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -14518,7 +14519,7 @@ checksum = "79f81d38d7a2ed52d8f034e62c568e111df9bf8aba2f7cf19ddc5bf7bd89d520" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -14538,7 +14539,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", "synstructure", ] @@ -14559,7 +14560,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] @@ -14581,7 +14582,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.101", ] [[package]] From addde2e9f9e8837146171befd100d8f4bfe82163 Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 17:52:11 +0200 Subject: [PATCH 15/17] fix --- packages/canlog/BUILD.bazel | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/canlog/BUILD.bazel b/packages/canlog/BUILD.bazel index b98b356320a4..47251b52cd51 100644 --- a/packages/canlog/BUILD.bazel +++ b/packages/canlog/BUILD.bazel @@ -3,8 +3,6 @@ load("@rules_rust//rust:defs.bzl", "rust_doc", "rust_doc_test", "rust_library", package(default_visibility = ["//visibility:public"]) DEPENDENCIES = [ - # Keep sorted. - "//packages/canlog_derive", "@crate_index//:candid", "@crate_index//:ic-canister-log", "@crate_index//:ic-cdk", @@ -13,15 +11,20 @@ DEPENDENCIES = [ "@crate_index//:serde_json", ] +MACRO_DEPENDENCIES = [ + # Keep sorted. + "//packages/canlog_derive", +] + DEV_DEPENDENCIES = [ # Keep sorted. "@crate_index//:proptest", - "//packages/canlog_derive", ] rust_library( name = "canlog", srcs = glob(["src/**/*.rs"]), + proc_macro_deps = MACRO_DEPENDENCIES, deps = DEPENDENCIES, ) From 129f78f100044741dd829c0f943e97910e28be69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Demay?= Date: Mon, 28 Apr 2025 16:27:18 +0000 Subject: [PATCH 16/17] XC-284: buildifier --- packages/canlog/BUILD.bazel | 2 +- packages/canlog_derive/BUILD.bazel | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/canlog/BUILD.bazel b/packages/canlog/BUILD.bazel index 47251b52cd51..3731be033a0a 100644 --- a/packages/canlog/BUILD.bazel +++ b/packages/canlog/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_rust//rust:defs.bzl", "rust_doc", "rust_doc_test", "rust_library", "rust_test", "rust_test_suite") +load("@rules_rust//rust:defs.bzl", "rust_doc", "rust_doc_test", "rust_library", "rust_test") package(default_visibility = ["//visibility:public"]) diff --git a/packages/canlog_derive/BUILD.bazel b/packages/canlog_derive/BUILD.bazel index 05f2e9818913..5e9d521398d0 100644 --- a/packages/canlog_derive/BUILD.bazel +++ b/packages/canlog_derive/BUILD.bazel @@ -1,13 +1,13 @@ -load("@rules_rust//rust:defs.bzl", "rust_doc", "rust_doc_test", "rust_library", "rust_proc_macro", "rust_test", "rust_test_suite") +load("@rules_rust//rust:defs.bzl", "rust_doc", "rust_doc_test", "rust_proc_macro") package(default_visibility = ["//visibility:public"]) DEPENDENCIES = [ # Keep sorted. - "@crate_index//:syn2", - "@crate_index//:quote", - "@crate_index//:proc-macro2", "@crate_index//:darling", + "@crate_index//:proc-macro2", + "@crate_index//:quote", + "@crate_index//:syn2", ] DEV_DEPENDENCIES = [ From 750ed93d91806cabc3067bae9a3d84730f7decc4 Mon Sep 17 00:00:00 2001 From: gregorydemay Date: Mon, 28 Apr 2025 18:47:45 +0200 Subject: [PATCH 17/17] add missing deps --- packages/canlog/BUILD.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/canlog/BUILD.bazel b/packages/canlog/BUILD.bazel index 3731be033a0a..e927c76360be 100644 --- a/packages/canlog/BUILD.bazel +++ b/packages/canlog/BUILD.bazel @@ -31,6 +31,7 @@ rust_library( rust_test( name = "unit_tests", crate = ":canlog", + deps = DEPENDENCIES + DEV_DEPENDENCIES, ) rust_doc(