Skip to content

Commit 043e535

Browse files
committed
fix: preprocessor regression + cargo.toml + default lint config tests
1 parent d8dbd2d commit 043e535

File tree

6 files changed

+66
-216
lines changed

6 files changed

+66
-216
lines changed

Cargo.lock

Lines changed: 27 additions & 176 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -194,15 +194,10 @@ foundry-block-explorers = { version = "0.13.0", default-features = false }
194194
foundry-compilers = { version = "0.14.0", default-features = false }
195195
foundry-fork-db = "0.12"
196196
solang-parser = "=0.3.3"
197-
# TODO: enable again after 0.1.3 release
198-
# solar-ast = { version = "=0.1.2", default-features = false }
199-
# solar-parse = { version = "=0.1.2", default-features = false }
200-
# solar-interface = { version = "=0.1.2", default-features = false }
201-
# solar-sema = { version = "=0.1.2", default-features = false }
202-
solar-ast = { git = "https://github.com/paradigmxyz/solar", branch = "main", package = "solar-ast" }
203-
solar-parse = { git = "https://github.com/paradigmxyz/solar", branch = "main", package = "solar-parse" }
204-
solar-interface = { git = "https://github.com/paradigmxyz/solar", branch = "main", package = "solar-interface" }
205-
solar-sema = { git = "https://github.com/paradigmxyz/solar", branch = "main", package = "solar-sema" }
197+
solar-ast = { version = "=0.1.2", default-features = false }
198+
solar-parse = { version = "=0.1.2", default-features = false }
199+
solar-interface = { version = "=0.1.2", default-features = false }
200+
solar-sema = { version = "=0.1.2", default-features = false }
206201

207202
## revm
208203
revm = { version = "19.4.0", default-features = false }
@@ -369,3 +364,10 @@ idna_adapter = "=1.1.0"
369364
# alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "7fab7ee" }
370365
# alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "7fab7ee" }
371366
# alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "7fab7ee" }
367+
368+
# TODO: comment out after 0.1.3 release
369+
# solar
370+
solar-ast = { git = "https://github.com/paradigmxyz/solar", branch = "main", package = "solar-ast" }
371+
solar-parse = { git = "https://github.com/paradigmxyz/solar", branch = "main", package = "solar-parse" }
372+
solar-interface = { git = "https://github.com/paradigmxyz/solar", branch = "main", package = "solar-interface" }
373+
solar-sema = { git = "https://github.com/paradigmxyz/solar", branch = "main", package = "solar-sema" }

crates/common/src/preprocessor/deps.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,6 @@ pub(crate) fn remove_bytecode_dependencies(
323323
"_args: encodeArgs{id}(DeployHelper{id}.FoundryPpConstructorArgs",
324324
id = dep.referenced_contract.get()
325325
));
326-
if *call_args_offset > 0 {
327-
update.push('(');
328-
}
329326
updates.insert((dep.loc.start, dep.loc.end + call_args_offset, update));
330327
updates.insert((
331328
dep.loc.end + args_length,

0 commit comments

Comments
 (0)