update & lock solang (gakonst#1256)

joleeee · May 13, 2022 · 135bca4 · 135bca4
1 parent 94cf8a8
commit 135bca4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ethers-solc/Cargo.toml b/ethers-solc/Cargo.toml
@@ -35,7 +35,7 @@ tempfile = { version = "3.3.0", optional = true }
 fs_extra = { version = "1.2.0", optional = true }
 sha2 = { version = "0.9.8", default-features = false, optional = true }
 dunce = "1.0.2"
-solang-parser = { default-features = false, version = "0.1.12" }
+solang-parser = { default-features = false, version = "=0.1.13" }
 rayon = "1.5.2"
 rand = { version = "0.8.5", optional = true }
 path-slash = "0.1.4"

diff --git a/ethers-solc/src/resolver/parse.rs b/ethers-solc/src/resolver/parse.rs
@@ -49,7 +49,7 @@ impl SolData {
             Ok((units, _)) => {
                 for unit in units.0 {
                     match unit {
-                        SourceUnitPart::PragmaDirective(loc, _, pragma, value) => {
+                        SourceUnitPart::PragmaDirective(loc, pragma, value) => {
                             if pragma.name == "solidity" {
                                 // we're only interested in the solidity version pragma
                                 version = Some(SolDataUnit::from_loc(value.string.clone(), loc));
@@ -60,7 +60,7 @@ impl SolData {
                                     Some(SolDataUnit::from_loc(value.string.clone(), loc));
                             }
                         }
-                        SourceUnitPart::ImportDirective(_, import) => {
+                        SourceUnitPart::ImportDirective(import) => {
                             let (import, ids, loc) = match import {
                                 Import::Plain(s, l) => (s, vec![], l),
                                 Import::GlobalSymbol(s, i, l) => (s, vec![(i, None)], l),

diff --git a/ethers-solc/src/utils.rs b/ethers-solc/src/utils.rs
@@ -415,7 +415,7 @@ mod tests {
         let (unit, _) = solang_parser::parse(s, 0).unwrap();
         assert_eq!(unit.0.len(), 1);
         match unit.0[0] {
-            SourceUnitPart::ImportDirective(_, _) => {}
+            SourceUnitPart::ImportDirective(_) => {}
             _ => unreachable!("failed to parse import"),
         }
         let imports: Vec<_> = find_import_paths(s).map(|m| m.as_str()).collect();