Replaces &str by &[u8]. (#469)

solana-labs · May 31, 2023 · 256b617 · 256b617
1 parent 8ef2dcd
commit 256b617
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 156 deletions.
diff --git a/src/assembler.rs b/src/assembler.rs
@@ -239,8 +239,13 @@ pub fn assemble<C: ContextObject>(
         match statement {
             Statement::Label { name } => {
                 if name.starts_with("function_") || name == "entrypoint" {
-                    register_internal_function(&mut function_registry, &loader, insn_ptr, name)
-                        .map_err(|_| format!("Label hash collision {name}"))?;
+                    register_internal_function(
+                        &mut function_registry,
+                        &loader,
+                        insn_ptr,
+                        name.as_bytes(),
+                    )
+                    .map_err(|_| format!("Label hash collision {name}"))?;
                 }
                 labels.insert(name.as_str(), insn_ptr);
             }
@@ -291,7 +296,7 @@ pub fn assemble<C: ContextObject>(
                                 &mut function_registry,
                                 &loader,
                                 target_pc as usize,
-                                label,
+                                label.as_bytes(),
                             )
                             .map_err(|_| format!("Label hash collision {name}"))?;
                             insn(opc, 0, 1, 0, target_pc)