chore: bump yang3 to 0.12

Signed-off-by: Renato Westphal <[email protected]>

Cargo.toml

@@ -78,7 +78,7 @@ tonic = { version = "0.12", features = ["tls"] }
 tonic-build = "0.12"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
-yang3 = { version = "0.9", features = ["bundled"] }
+yang3 = { version = "0.12", features = ["bundled"] }
 
 [workspace.lints.rust]
 rust_2018_idioms = { level = "warn", priority = -1 }

holo-northbound/build.rs

@@ -226,7 +226,7 @@ impl<'a> StructBuilder<'a> {
         // into_data_node() function implementation.
         writeln!(
             output,
-            "{}fn into_data_node(self: Box<Self>, dnode: &mut DataNodeRef<'_, '_>) {{",
+            "{}fn into_data_node(self: Box<Self>, dnode: &mut DataNodeRef<'_>) {{",
             indent2
         )
         .unwrap();

holo-northbound/src/configuration.rs

@@ -62,7 +62,7 @@ pub struct CallbackArgs<'a, P: Provider> {
     pub resource: &'a mut Option<P::Resource>,
     pub old_config: &'a Arc<DataTree<'static>>,
     pub new_config: &'a Arc<DataTree<'static>>,
-    pub dnode: DataNodeRef<'a, 'static>,
+    pub dnode: DataNodeRef<'a>,
 }
 
 //
@@ -80,7 +80,7 @@ pub struct ValidationCallbacksBuilder {
 
 #[derive(Debug)]
 pub struct ValidationCallbackArgs<'a> {
-    pub dnode: DataNodeRef<'a, 'static>,
+    pub dnode: DataNodeRef<'a>,
 }
 
 //
@@ -93,7 +93,7 @@ pub type ConfigChanges = Vec<ConfigChange>;
 pub type CallbackLookup<P: Provider> = for<'a> fn(
     &'a mut P,
     list_entry: P::ListEntry,
-    dnode: DataNodeRef<'a, 'static>,
+    dnode: DataNodeRef<'a>,
 ) -> P::ListEntry;
 
 pub type CallbackPhaseOne<P> =
@@ -512,7 +512,7 @@ fn lookup_list_entry<P>(
     phase: CommitPhase,
     operation: CallbackOp,
     callbacks: &Callbacks<P>,
-    dnode: &DataNodeRef<'_, 'static>,
+    dnode: &DataNodeRef<'_>,
 ) -> P::ListEntry
 where
     P: Provider,

holo-northbound/src/rpc.rs

@@ -58,7 +58,7 @@ pub trait Provider: ProviderBase {
 
     fn relay_rpc(
         &self,
-        _rpc: DataNodeRef<'_, '_>,
+        _rpc: DataNodeRef<'_>,
     ) -> Result<Option<Vec<NbDaemonSender>>, String> {
         Ok(None)
     }
@@ -194,9 +194,7 @@ async fn process_rpc_relayed(
     Ok(response)
 }
 
-fn find_rpc<'a>(
-    data: &'a DataTree<'static>,
-) -> Result<DataNodeRef<'a, 'static>, Error> {
+fn find_rpc<'a>(data: &'a DataTree<'static>) -> Result<DataNodeRef<'a>, Error> {
     data.traverse()
         .find(|dnode| {
             matches!(

holo-northbound/src/state.rs

@@ -216,7 +216,7 @@ where
 fn iterate_node<'a, P>(
     provider: &'a P,
     cbs: &Callbacks<P>,
-    dnode: &mut DataNodeRef<'_, '_>,
+    dnode: &mut DataNodeRef<'_>,
     snode: &SchemaNode<'_>,
     list_entry: &P::ListEntry<'a>,
     relay_list: &mut Vec<RelayedRequest>,
@@ -248,7 +248,7 @@ where
 fn iterate_list<'a, P>(
     provider: &'a P,
     cbs: &Callbacks<P>,
-    dnode: &mut DataNodeRef<'_, '_>,
+    dnode: &mut DataNodeRef<'_>,
     snode: &SchemaNode<'_>,
     parent_list_entry: &P::ListEntry<'a>,
     relay_list: &mut Vec<RelayedRequest>,
@@ -277,7 +277,7 @@ where
 fn iterate_list_entry<'a, P>(
     provider: &'a P,
     cbs: &Callbacks<P>,
-    dnode: &mut DataNodeRef<'_, '_>,
+    dnode: &mut DataNodeRef<'_>,
     snode: &SchemaNode<'_>,
     list_entry: P::ListEntry<'a>,
     relay_list: &mut Vec<RelayedRequest>,
@@ -335,7 +335,7 @@ where
 fn iterate_container<'a, P>(
     provider: &'a P,
     cbs: &Callbacks<P>,
-    dnode: &mut DataNodeRef<'_, '_>,
+    dnode: &mut DataNodeRef<'_>,
     snode: &SchemaNode<'_>,
     list_entry: &P::ListEntry<'a>,
     relay_list: &mut Vec<RelayedRequest>,
@@ -380,7 +380,7 @@ where
 fn iterate_children<'a, P>(
     provider: &'a P,
     cbs: &Callbacks<P>,
-    dnode: &mut DataNodeRef<'_, '_>,
+    dnode: &mut DataNodeRef<'_>,
     snode: &SchemaNode<'_>,
     list_entry: &P::ListEntry<'a>,
     relay_list: &mut Vec<RelayedRequest>,
@@ -425,7 +425,7 @@ where
 fn lookup_list_entry<'a, P>(
     provider: &'a P,
     cbs: &Callbacks<P>,
-    dnode: &DataNodeRef<'_, '_>,
+    dnode: &DataNodeRef<'_>,
 ) -> P::ListEntry<'a>
 where
     P: Provider,

holo-routing/src/northbound/rpc.rs

@@ -37,7 +37,7 @@ impl Provider for Master {
 
     fn relay_rpc(
         &self,
-        rpc: DataNodeRef<'_, '_>,
+        rpc: DataNodeRef<'_>,
     ) -> Result<Option<Vec<NbDaemonSender>>, String> {
         let (protocol, name) = find_instance(rpc)?;
 
@@ -68,7 +68,7 @@ impl Provider for Master {
 // easy way to identify the protocol type and name. YANG actions would greatly
 // simplify this.
 fn find_instance(
-    rpc: DataNodeRef<'_, '_>,
+    rpc: DataNodeRef<'_>,
 ) -> Result<(Protocol, Option<String>), String> {
     let (protocol, name) = match rpc.schema().module().name() {
         "ietf-bgp" => {

holo-utils/src/yang.rs

@@ -106,7 +106,7 @@ impl SchemaNodeExt for SchemaNode<'_> {
 
 // ===== impl DataNodeRef =====
 
-impl DataNodeRefExt for DataNodeRef<'_, '_> {
+impl DataNodeRefExt for DataNodeRef<'_> {
     fn exists(&self, path: &str) -> bool {
         self.find_xpath(path).unwrap().next().is_some()
     }
@@ -356,7 +356,7 @@ impl DataNodeRefExt for DataNodeRef<'_, '_> {
 
 // ===== helper functions =====
 
-fn panic_wrong_dnode_type(dnode: &DataNodeRef<'_, '_>, expected: &str) -> ! {
+fn panic_wrong_dnode_type(dnode: &DataNodeRef<'_>, expected: &str) -> ! {
     panic!(
         "wrong data node type (was expecting {}): {}",
         expected,

holo-yang/src/lib.rs

@@ -317,7 +317,7 @@ pub trait TryFromYang: Sized {
 pub trait YangObject {
     // Initialize a given YANG data node with attributes from the current
     // object.
-    fn into_data_node(self: Box<Self>, dnode: &mut DataNodeRef<'_, '_>);
+    fn into_data_node(self: Box<Self>, dnode: &mut DataNodeRef<'_>);
 
     // Return the keys of the list, or an empty string for containers or keyless
     // lists.