Update to pdl 0.3.0

Bug: 343968814
Test: m root-canal
Flag: TEST_ONLY
Change-Id: Ie16817255a3960dd8cc4976b078f52feaaded21b

6 files changed, 13 insertions, 13 deletions

diff --git a/tools/rootcanal/Android.bp b/tools/rootcanal/Android.bp
index 20447c8fad..a8dc2b6a39 100644
--- a/tools/rootcanal/Android.bp
+++ b/tools/rootcanal/Android.bp
@@ -457,7 +457,7 @@ genrule {
 
 genrule {
     name: "rootcanal_link_layer_packets_rust_gen",
-    defaults: ["pdl_rust_generator_defaults"],
+    defaults: ["pdl_rust_legacy_generator_defaults"],
     srcs: ["packets/link_layer_packets.pdl"],
     out: ["link_layer_packets.rs"],
 }
@@ -485,7 +485,7 @@ genrule {
 
 genrule {
     name: "rootcanal_hci_packets_rust_gen",
-    defaults: ["pdl_rust_generator_defaults"],
+    defaults: ["pdl_rust_legacy_generator_defaults"],
     srcs: ["packets/hci_packets.pdl"],
     out: ["hci_packets.rs"],
 }
diff --git a/tools/rootcanal/CMakeLists.txt b/tools/rootcanal/CMakeLists.txt
index 8d6a3ca617..2ca4e61be7 100644
--- a/tools/rootcanal/CMakeLists.txt
+++ b/tools/rootcanal/CMakeLists.txt
@@ -6,7 +6,6 @@ corrosion_import_crate(
     MANIFEST_PATH ${PDL_ROOT}/Cargo.toml
     FLAGS --offline --verbose --verbose)
 
-corrosion_set_env_vars(generate-canonical-tests CARGO_HOME=${Rust_CARGO_HOME})
 corrosion_set_env_vars(pdlc CARGO_HOME=${Rust_CARGO_HOME})
 corrosion_set_hostbuild(pdlc)
 
@@ -15,7 +14,6 @@ get_property(pdlc_EXECUTABLE TARGET pdlc PROPERTY EXECUTABLE_PATH)
 # These tests depend on the tempfile crate which was not imported because
 # the crate remove_dir_all does not have a compatible version.
 set_tests_properties(cargo-test_pdlc PROPERTIES DISABLED True)
-set_tests_properties(cargo-test_generate-canonical-tests PROPERTIES DISABLED True)
 
 android_license(
     TARGET pdlc
@@ -60,7 +58,7 @@ function(pdl_gen)
         OUTPUT "${pdl_OUTPUT_ABSOLUTE}"
         COMMAND
         ${pdlc_EXECUTABLE}
-                --output-format rust
+                --output-format rust_legacy
                 "${pdl_INPUT_ABSOLUTE}"
                     > "${pdl_OUTPUT_ABSOLUTE}"
         COMMENT "Generating rust module from ${pdl_INPUT}"
diff --git a/tools/rootcanal/rust/Android.bp b/tools/rootcanal/rust/Android.bp
index 128718881f..66a8e0877e 100644
--- a/tools/rootcanal/rust/Android.bp
+++ b/tools/rootcanal/rust/Android.bp
@@ -36,14 +36,14 @@ rust_ffi {
 
 genrule {
     name: "rootcanal_lmp_packets_rust_gen",
-    defaults: ["pdl_rust_generator_defaults"],
+    defaults: ["pdl_rust_legacy_generator_defaults"],
     srcs: ["lmp_packets.pdl"],
     out: ["lmp_packets.rs"],
 }
 
 genrule {
     name: "rootcanal_llcp_packets_rust_gen",
-    defaults: ["pdl_rust_generator_defaults"],
+    defaults: ["pdl_rust_legacy_generator_defaults"],
     srcs: ["llcp_packets.pdl"],
     out: ["llcp_packets.rs"],
 }
diff --git a/tools/rootcanal/rust/Cargo.toml b/tools/rootcanal/rust/Cargo.toml
index 15105748b8..993836ac98 100644
--- a/tools/rootcanal/rust/Cargo.toml
+++ b/tools/rootcanal/rust/Cargo.toml
@@ -26,7 +26,7 @@ num-derive = "0.3.3"
 num-integer = "0.1.45"
 num-traits = "0.2.14"
 paste = "1.0.4"
-pdl-runtime = "0.2.2"
+pdl-runtime = "0.3.0"
 pin-utils = "0.1.0"
 rand = "0.8.3"
 thiserror = "1.0.23"
diff --git a/tools/rootcanal/rust/src/llcp/iso.rs b/tools/rootcanal/rust/src/llcp/iso.rs
index 75754d3657..6d9997d5ba 100644
--- a/tools/rootcanal/rust/src/llcp/iso.rs
+++ b/tools/rootcanal/rust/src/llcp/iso.rs
@@ -327,11 +327,11 @@ impl IsoManager {
     }
 
     fn send_hci_event<E: Into<hci::Event>>(&self, event: E) {
-        self.ops.send_hci_event(&event.into().to_vec())
+        self.ops.send_hci_event(&event.into().encode_to_vec().unwrap())
     }
 
     fn send_llcp_packet<P: Into<llcp::LlcpPacket>>(&self, acl_connection_handle: u16, packet: P) {
-        self.ops.send_llcp_packet(acl_connection_handle, &packet.into().to_vec())
+        self.ops.send_llcp_packet(acl_connection_handle, &packet.into().encode_to_vec().unwrap())
     }
 
     fn get_le_features(&self) -> u64 {
diff --git a/tools/rootcanal/rust/src/lmp/manager.rs b/tools/rootcanal/rust/src/lmp/manager.rs
index 9e93a016ff..a8136f7e88 100644
--- a/tools/rootcanal/rust/src/lmp/manager.rs
+++ b/tools/rootcanal/rust/src/lmp/manager.rs
@@ -237,7 +237,7 @@ impl LinkManager {
             }
             _ => return Err(LinkManagerError::UnhandledHciPacket),
         };
-        self.ops.send_hci_event(&event.to_vec());
+        self.ops.send_hci_event(&event.encode_to_vec().unwrap());
         Ok(())
     }
 
@@ -318,13 +318,15 @@ impl procedure::Context for LinkContext {
 
     fn send_hci_event<E: Into<hci::Event>>(&self, event: E) {
         if let Some(manager) = self.manager.upgrade() {
-            manager.ops.send_hci_event(&event.into().to_vec())
+            manager.ops.send_hci_event(&event.into().encode_to_vec().unwrap())
         }
     }
 
     fn send_lmp_packet<P: Into<lmp::LmpPacket>>(&self, packet: P) {
         if let Some(manager) = self.manager.upgrade() {
-            manager.ops.send_lmp_packet(self.peer_address(), &packet.into().to_vec())
+            manager
+                .ops
+                .send_lmp_packet(self.peer_address(), &packet.into().encode_to_vec().unwrap())
         }
     }