rebase and address review comments

trailofbits · Nov 16, 2023 · 40daf19 · 40daf19
1 parent c4c55c1
commit 40daf19
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/blight/actions/embed_commands.py b/src/blight/actions/embed_commands.py
@@ -16,15 +16,15 @@
 
 from blight.action import CompilerAction
 from blight.enums import Lang
-from blight.tool import Tool
+from blight.tool import CompilerTool
 from blight.util import flock_append
 
 
-def cc_as_string(tool_record: Dict):
+def cc_as_string(tool_record: Dict) -> str:
     return json.dumps(tool_record).replace('"', '\\"').replace("\\\\", "\\")
 
 
-def add_to_envp(envp: Dict, key: str, value):
+def add_to_envp(envp: Dict, key: str, value) -> None:
     if isinstance(value, str):
         envp[key] = value.replace('"', "'")
     elif isinstance(value, list):
@@ -33,15 +33,15 @@ def add_to_envp(envp: Dict, key: str, value):
         envp[key] = value
 
 
-def is_input_assembly(tool: Tool):
+def is_input_assembly(tool: CompilerTool) -> bool:
     for file_path in tool.inputs:
         file_path_str = str(file_path)
         if file_path_str.endswith(".S") or file_path_str.endswith(".s"):
             return True
     return False
 
 
-def cc_as_dict(tool: Tool) -> Dict:
+def cc_as_dict(tool: CompilerTool) -> Dict:
     env = {}
     tool_dict = tool.asdict()
     old_env = tool_dict["env"]
@@ -117,4 +117,4 @@ def before_run(self, tool: CompilerTool) -> None:
             "-Wno-overlength-strings",
             "-Wno-error",
             "-Wno-unknown-escape-sequence",
-        ]
+            ]