Remove the unused &mut dependency_graph throughout sway-core

While working on #825 I noticed that that the `dependency_graph` is unused throughout `sway-core`. I think the reason why cargo doesn't emit any warnings about this is that at one point, it's stored in the public `TypeCheckArgument` struct, so cargo believes that it is intentionally being re-exported, however in reality we don't use it anywhere else in the fuel/sway/forc ecosystem.
FuelLabs · Feb 22, 2022 · 43ecfb3 · 43ecfb3
1 parent 323b4e1
commit 43ecfb3
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 146 deletions.
diff --git a/forc/src/ops/forc_build.rs b/forc/src/ops/forc_build.rs
@@ -21,7 +21,6 @@ use sway_core::{
 use sway_types::JsonABI;
 
 use anyhow::Result;
-use std::collections::{HashMap, HashSet};
 use std::path::{Path, PathBuf};
 
 pub fn build(command: BuildCommand) -> Result<(Vec<u8>, JsonABI), String> {
@@ -70,7 +69,6 @@ pub fn build(command: BuildCommand) -> Result<(Vec<u8>, JsonABI), String> {
     .print_intermediate_asm(print_intermediate_asm)
     .print_ir(print_ir);
 
-    let mut dependency_graph = HashMap::new();
     let namespace = create_module();
 
     let mut source_map = SourceMap::new();
@@ -83,7 +81,6 @@ pub fn build(command: BuildCommand) -> Result<(Vec<u8>, JsonABI), String> {
                 dependency_name,
                 dependency_details,
                 namespace,
-                &mut dependency_graph,
                 silent_mode,
                 offline_mode,
             )?;
@@ -109,7 +106,6 @@ pub fn build(command: BuildCommand) -> Result<(Vec<u8>, JsonABI), String> {
         &manifest.project.name,
         namespace,
         build_config,
-        &mut dependency_graph,
         &mut source_map,
         silent_mode,
     )?;
@@ -172,7 +168,6 @@ fn compile_dependency_lib<'manifest>(
     dependency_name: &'manifest str,
     dependency_lib: &mut Dependency,
     namespace: NamespaceRef,
-    dependency_graph: &mut HashMap<String, HashSet<String>>,
     silent_mode: bool,
     offline_mode: bool,
 ) -> Result<JsonABI, String> {
@@ -261,7 +256,6 @@ fn compile_dependency_lib<'manifest>(
                 dependency_name,
                 dependency_lib,
                 dep_namespace,
-                dependency_graph,
                 silent_mode,
                 offline_mode,
             )?;
@@ -275,7 +269,6 @@ fn compile_dependency_lib<'manifest>(
         &manifest_of_dep.project.name,
         dep_namespace,
         build_config,
-        dependency_graph,
         silent_mode,
     )?;
 
@@ -289,10 +282,9 @@ fn compile_library(
     proj_name: &str,
     namespace: NamespaceRef,
     build_config: BuildConfig,
-    dependency_graph: &mut HashMap<String, HashSet<String>>,
     silent_mode: bool,
 ) -> Result<(NamespaceRef, JsonABI), String> {
-    let res = sway_core::compile_to_ast(source, namespace, &build_config, dependency_graph);
+    let res = sway_core::compile_to_ast(source, namespace, &build_config);
     match res {
         CompileAstResult::Success {
             parse_tree,
@@ -325,11 +317,10 @@ fn compile(
     proj_name: &str,
     namespace: NamespaceRef,
     build_config: BuildConfig,
-    dependency_graph: &mut HashMap<String, HashSet<String>>,
     source_map: &mut SourceMap,
     silent_mode: bool,
 ) -> Result<(Vec<u8>, JsonABI), String> {
-    let ast_res = sway_core::compile_to_ast(source, namespace, &build_config, dependency_graph);
+    let ast_res = sway_core::compile_to_ast(source, namespace, &build_config);
     let (json_abi, tree_type, warnings) = match &ast_res {
         CompileAstResult::Success {
             parse_tree,
@@ -372,10 +363,9 @@ fn compile_to_asm(
     proj_name: &str,
     namespace: NamespaceRef,
     build_config: BuildConfig,
-    dependency_graph: &mut HashMap<String, HashSet<String>>,
     silent_mode: bool,
 ) -> Result<FinalizedAsm, String> {
-    let res = sway_core::compile_to_asm(source, namespace, build_config, dependency_graph);
+    let res = sway_core::compile_to_asm(source, namespace, build_config);
     match res {
         CompilationResult::Success { asm, warnings } => {
             print_on_success(silent_mode, proj_name, &warnings, TreeType::Script {});

diff --git a/sway-core/src/lib.rs b/sway-core/src/lib.rs
@@ -28,7 +28,7 @@ pub use build_config::BuildConfig;
 use control_flow_analysis::{ControlFlowGraph, Graph};
 use pest::iterators::Pair;
 use pest::Parser;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 use std::sync::Arc;
 
 pub use semantic_analysis::{
@@ -244,7 +244,6 @@ pub(crate) fn compile_inner_dependency(
     initial_namespace: NamespaceRef,
     build_config: BuildConfig,
     dead_code_graph: &mut ControlFlowGraph,
-    dependency_graph: &mut HashMap<String, HashSet<String>>,
 ) -> CompileResult<InnerDependencyCompileResult> {
     let mut warnings = Vec::new();
     let mut errors = Vec::new();
@@ -274,7 +273,6 @@ pub(crate) fn compile_inner_dependency(
             &parse_tree.tree_type,
             &build_config,
             dead_code_graph,
-            dependency_graph,
         ),
         return err(warnings, errors),
         warnings,
@@ -309,7 +307,6 @@ pub fn compile_to_ast(
     input: Arc<str>,
     initial_namespace: crate::semantic_analysis::NamespaceRef,
     build_config: &BuildConfig,
-    dependency_graph: &mut HashMap<String, HashSet<String>>,
 ) -> CompileAstResult {
     let mut warnings = Vec::new();
     let mut errors = Vec::new();
@@ -333,7 +330,6 @@ pub fn compile_to_ast(
             &parse_tree.tree_type,
             &build_config.clone(),
             &mut dead_code_graph,
-            dependency_graph,
         ),
         return CompileAstResult::Failure { errors, warnings },
         warnings,
@@ -367,9 +363,8 @@ pub fn compile_to_asm(
     input: Arc<str>,
     initial_namespace: crate::semantic_analysis::NamespaceRef,
     build_config: BuildConfig,
-    dependency_graph: &mut HashMap<String, HashSet<String>>,
 ) -> CompilationResult {
-    let ast_res = compile_to_ast(input, initial_namespace, &build_config, dependency_graph);
+    let ast_res = compile_to_ast(input, initial_namespace, &build_config);
     ast_to_asm(ast_res, &build_config)
 }
 
@@ -514,10 +509,14 @@ pub fn compile_to_bytecode(
     input: Arc<str>,
     initial_namespace: crate::semantic_analysis::NamespaceRef,
     build_config: BuildConfig,
-    dependency_graph: &mut HashMap<String, HashSet<String>>,
+    //dependency_graph: &mut HashMap<String, HashSet<String>>,
     source_map: &mut SourceMap,
 ) -> BytecodeCompilationResult {
-    let asm_res = compile_to_asm(input, initial_namespace, build_config, dependency_graph);
+    let asm_res = compile_to_asm(
+        input,
+        initial_namespace,
+        build_config, /*dependency_graph*/
+    );
     asm_to_bytecode(asm_res, source_map)
 }
 

diff --git a/sway-core/src/optimize.rs b/sway-core/src/optimize.rs
@@ -1615,7 +1615,6 @@ mod tests {
             &TreeType::Script,
             &build_config,
             &mut dead_code_graph,
-            &mut std::collections::HashMap::new(),
         )
         .unwrap(&mut warnings, &mut errors)
     }

diff --git a/sway-core/src/semantic_analysis/ast_node/code_block.rs b/sway-core/src/semantic_analysis/ast_node/code_block.rs
@@ -25,7 +25,6 @@ impl TypedCodeBlock {
             self_type,
             build_config,
             dead_code_graph,
-            dependency_graph,
             opts,
             ..
         } = arguments;
@@ -46,7 +45,6 @@ impl TypedCodeBlock {
                     self_type,
                     build_config,
                     dead_code_graph,
-                    dependency_graph,
                     mode: Mode::NonAbi,
                     opts,
                 })

diff --git a/sway-core/src/semantic_analysis/ast_node/declaration/function.rs b/sway-core/src/semantic_analysis/ast_node/declaration/function.rs
@@ -49,7 +49,6 @@ impl TypedFunctionDeclaration {
             build_config,
             dead_code_graph,
             mode,
-            dependency_graph,
             mut opts,
             ..
         } = arguments;
@@ -137,7 +136,6 @@ impl TypedFunctionDeclaration {
                 self_type,
                 build_config,
                 dead_code_graph,
-                dependency_graph,
                 mode: Mode::NonAbi,
                 opts,
             }),

diff --git a/sway-core/src/semantic_analysis/ast_node/expression/enum_instantiation.rs b/sway-core/src/semantic_analysis/ast_node/expression/enum_instantiation.rs
@@ -16,7 +16,6 @@ pub(crate) fn instantiate_enum(
     self_type: TypeId,
     build_config: &BuildConfig,
     dead_code_graph: &mut ControlFlowGraph,
-    dependency_graph: &mut HashMap<String, HashSet<String>>,
     opts: TCOpts,
 ) -> CompileResult<TypedExpression> {
     let mut warnings = vec![];
@@ -75,7 +74,6 @@ pub(crate) fn instantiate_enum(
                     self_type,
                     build_config,
                     dead_code_graph,
-                    dependency_graph,
                     mode: Mode::NonAbi,
                     opts,
                 }),