chore: cleanup workspace deps (foundry-rs#158)

sort + rm a few

Author: DaniPopes

Cargo.toml

@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/foundry-rs/compilers"
 homepage = "https://github.com/foundry-rs/compilers"
 documentation = "https://docs.rs/foundry-compilers"
-description = "Utilities for working with solidity compilers, namely solc"
+description = "Utilities for working with EVM language compilers"
 keywords = ["foundry", "solidity", "solc", "ethereum", "ethers"]
 edition = "2021"
 exclude = [".github/", "scripts/", "test-data/"]
@@ -31,27 +31,33 @@ unused-must-use = "deny"
 all = "warn"
 
 [workspace.dependencies]
+foundry-compilers = { path = "crates/compilers", version = "0.8.0" }
+foundry-compilers-artifacts = { path = "crates/artifacts/artifacts", version = "0.8.0" }
 foundry-compilers-artifacts-solc = { path = "crates/artifacts/solc", version = "0.8.0" }
 foundry-compilers-artifacts-vyper = { path = "crates/artifacts/vyper", version = "0.8.0" }
-foundry-compilers-artifacts = { path = "crates/artifacts/artifacts", version = "0.8.0" }
 foundry-compilers-core = { path = "crates/core", version = "0.8.0" }
-serde = { version = "1", features = ["derive", "rc"] }
-semver = { version = "1.0", features = ["serde"] }
-serde_json = "1.0"
-alloy-primitives = { version = "0.7", features = ["serde", "rand"] }
+
 alloy-json-abi = { version = "0.7", features = ["serde_json"] }
-tracing = "0.1"
-rayon = "1.8"
-thiserror = "1"
-regex = "1.10"
-path-slash = "0.2"
+alloy-primitives = { version = "0.7", features = ["serde", "rand"] }
+cfg-if = "1.0"
+dunce = "1.0"
 md-5 = "0.10"
-yansi = "1.0.1"
+memmap2 = "0.9"
 once_cell = "1.19"
-svm = { package = "svm-rs", version = "0.5", default-features = false }
-solang-parser = { version = "=0.3.3", default-features = false }
+path-slash = "0.2"
+rayon = "1.8"
+regex = "1.10"
+semver = { version = "1.0", features = ["serde"] }
+serde = { version = "1", features = ["derive", "rc"] }
+serde_json = "1.0"
 similar-asserts = "1"
+solang-parser = { version = "=0.3.3", default-features = false }
+svm = { package = "svm-rs", version = "0.5", default-features = false }
 tempfile = "3.9"
+thiserror = "1"
+tracing = "0.1"
+walkdir = "2.5"
+yansi = "1.0"
 
 # async
 futures-util = "0.3"

crates/artifacts/solc/Cargo.toml

@@ -17,20 +17,19 @@ workspace = true
 [dependencies]
 foundry-compilers-core.workspace = true
 
-serde.workspace = true
-semver.workspace = true
-serde_json.workspace = true
-tracing.workspace = true
-alloy-primitives.workspace = true
 alloy-json-abi.workspace = true
+alloy-primitives.workspace = true
+futures-util = { workspace = true, optional = true }
+md-5.workspace = true
 rayon.workspace = true
+semver.workspace = true
+serde_json.workspace = true
+serde.workspace = true
 thiserror.workspace = true
-md-5.workspace = true
-yansi.workspace = true
-futures-util = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
-
-walkdir = "2.4"
+tracing.workspace = true
+walkdir.workspace = true
+yansi.workspace = true
 
 [target.'cfg(windows)'.dependencies]
 path-slash.workspace = true

crates/core/Cargo.toml

@@ -15,27 +15,26 @@ exclude.workspace = true
 workspace = true
 
 [dependencies]
-thiserror.workspace = true
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-regex.workspace = true
-path-slash.workspace = true
 alloy-primitives.workspace = true
+cfg-if.workspace = true
+dunce.workspace = true
+memmap2.workspace = true
 once_cell.workspace = true
+path-slash.workspace = true
+regex.workspace = true
+semver.workspace = true
+serde_json.workspace = true
+serde.workspace = true
+thiserror.workspace = true
+walkdir.workspace = true
+
 svm = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
 
-walkdir = "2.4"
-dunce = "1.0"
-memmap2 = "0.9"
-cfg-if = "1.0.0"
-
 tempfile = { workspace = true, optional = true }
 fs_extra = { version = "1.3", optional = true }
 
 [dev-dependencies]
-solang-parser.workspace = true
 tempfile.workspace = true
 
 [features]

crates/core/src/utils.rs

@@ -663,7 +663,6 @@ pub fn mkdir_or_touch(tmp: &std::path::Path, paths: &[&str]) {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use solang_parser::pt::SourceUnitPart;
     use std::fs::{create_dir_all, File};
 
     #[test]
@@ -740,15 +739,7 @@ mod tests {
     fn can_parse_curly_bracket_imports() {
         let s =
             r#"import {ReentrancyGuard} from "@openzeppelin/contracts/utils/ReentrancyGuard.sol";"#;
-
-        let (unit, _) = solang_parser::parse(s, 0).unwrap();
-        assert_eq!(unit.0.len(), 1);
-        match unit.0[0] {
-            SourceUnitPart::ImportDirective(_) => {}
-            _ => unreachable!("failed to parse import"),
-        }
         let imports: Vec<_> = find_import_paths(s).map(|m| m.as_str()).collect();
-
         assert_eq!(imports, vec!["@openzeppelin/contracts/utils/ReentrancyGuard.sol"])
     }