chore(rust): minor v1 cleanup v2 prep (#1510)

Author: nyurik

justfile

@@ -69,6 +69,12 @@ ci-extract-version language tag:
 mlt *args:
     cargo run --manifest-path {{join(justfile_directory(), 'rust', 'Cargo.toml')}} --package mlt -- "$@"
 
+# Run the mlt CLI tool with the given arguments from current dir.
+[no-cd]
+[positional-arguments]  # avoids shell expansions
+mlt-rel *args:
+    cargo run --release --manifest-path {{join(justfile_directory(), 'rust', 'Cargo.toml')}} --package mlt -- "$@"
+
 # Ensure a command is available
 assert-cmd command:
     #!/usr/bin/env bash

rust/mlt-core/src/decoder/layer.rs

@@ -37,7 +37,6 @@ impl<'a> Layer<'a> {
         let (input, value) = take(input, size)?;
 
         let layer = match tag {
-            // For now, we only support tag 0x01 layers, but more will be added soon
             1 => Layer::Tag01(Layer01::from_bytes(value, parser)?),
             tag => Layer::Unknown(Unknown { tag, value }),
         };
@@ -51,7 +50,7 @@ impl<'a> Layer<'a> {
     /// `Layer::Tag01(lazy)` and call the individual methods on [`Layer01`].
     pub fn decode_all(self, dec: &mut Decoder) -> MltResult<ParsedLayer<'a>> {
         match self {
-            Layer::Tag01(lazy) => Ok(Layer::Tag01(lazy.decode_all(dec)?)),
+            Layer::Tag01(v) => Ok(Layer::Tag01(v.decode_all(dec)?)),
             Layer::Unknown(u) => Ok(Layer::Unknown(u)),
         }
     }

rust/mlt-core/src/utils/test_helpers.rs

@@ -26,8 +26,8 @@ pub fn assert_empty<T>(result: MltRefResult<T>) -> T {
 #[must_use]
 pub fn into_layer01(layer: Layer) -> Layer01 {
     match layer {
-        Layer::Tag01(layer01) => layer01,
-        Layer::Unknown(_) => panic!("expected Tag01 layer"),
+        Layer::Tag01(v) => v,
+        Layer::Unknown(v) => panic!("expected Tag01 layer, got Tag{:02x}", v.tag),
     }
 }
 

rust/mlt-core/tests/unknown_layer.rs

@@ -73,9 +73,10 @@ fn unknown_zero_length_body() {
 
 #[test]
 fn multiple_layers_mixed_unknown_and_tag01() {
-    // Build two unknown layers back-to-back (tags 2 and 3, since tag=1 is Tag01).
-    let mut raw = unknown_layer_bytes(2, b"hello");
-    raw.extend_from_slice(&unknown_layer_bytes(3, b"world"));
+    // Build two unknown layers back-to-back.
+    // so use tags 10 and 11 for these "unknown" tests.
+    let mut raw = unknown_layer_bytes(10, b"hello");
+    raw.extend_from_slice(&unknown_layer_bytes(11, b"world"));
 
     let layers = Parser::default()
         .parse_layers(&raw)
@@ -86,12 +87,12 @@ fn multiple_layers_mixed_unknown_and_tag01() {
     let Layer::Unknown(u0) = &layers[0] else {
         panic!("expected Unknown at index 0");
     };
-    assert_eq!(u0.tag(), 2u32);
+    assert_eq!(u0.tag(), 10);
     assert_eq!(u0.data(), b"hello");
 
     let Layer::Unknown(u1) = &layers[1] else {
         panic!("expected Unknown at index 1");
     };
-    assert_eq!(u1.tag(), 3u32);
+    assert_eq!(u1.tag(), 11);
     assert_eq!(u1.data(), b"world");
 }