chore(deps): bump solar 0.1.1 (#9627)

Author: DaniPopes

Cargo.lock

@@ -171,11 +171,10 @@ foundry-linking = { path = "crates/linking" }
 
 # solc & compilation utilities
 foundry-block-explorers = { version = "0.9.0", default-features = false }
-foundry-compilers = { version = "0.12.8", default-features = false }
+foundry-compilers = { version = "0.12.9", default-features = false }
 foundry-fork-db = "0.10.0"
 solang-parser = "=0.3.3"
-solar-ast = { version = "=0.1.0", default-features = false }
-solar-parse = { version = "=0.1.0", default-features = false }
+solar-parse = { version = "=0.1.1", default-features = false }
 
 ## revm
 revm = { version = "19.0.0", default-features = false }

Cargo.toml

@@ -15,7 +15,7 @@ use rustyline::{
     Helper,
 };
 use solar_parse::{
-    interface::{Pos, Session, SessionGlobals},
+    interface::{Session, SessionGlobals},
     token::{Token, TokenKind},
     Lexer,
 };

crates/chisel/src/solidity_helper.rs

@@ -22,7 +22,6 @@ alloy-primitives = { workspace = true, features = ["serde"] }
 revm-primitives.workspace = true
 
 solar-parse.workspace = true
-solar-ast.workspace = true
 
 dirs-next = "2"
 dunce.workspace = true

crates/config/Cargo.toml

@@ -6,11 +6,13 @@ use foundry_compilers::{
 };
 use itertools::Itertools;
 use serde_json::Value;
-use solar_ast::{
-    ast::{Arena, CommentKind, Item, ItemKind},
-    interface::{self, Session},
+use solar_parse::{
+    ast::{
+        interface::{self, Session},
+        Arena, CommentKind, Item, ItemKind,
+    },
+    Parser,
 };
-use solar_parse::Parser;
 use std::{collections::BTreeMap, path::Path};
 
 /// Convenient struct to hold in-line per-test configurations

crates/config/src/inline/natspec.rs

@@ -11,10 +11,7 @@ use foundry_compilers::{
 use foundry_evm_core::utils::PcIcMap;
 use foundry_linking::Linker;
 use rayon::prelude::*;
-use solar_parse::{
-    interface::{Pos, Session},
-    Parser,
-};
+use solar_parse::{interface::Session, Parser};
 use std::{
     collections::{BTreeMap, HashMap},
     ops::Range,

crates/evm/traces/src/debug/sources.rs

@@ -89,7 +89,6 @@ semver.workspace = true
 serde_json.workspace = true
 similar = { version = "2", features = ["inline"] }
 solang-parser.workspace = true
-solar-ast.workspace = true
 solar-parse.workspace = true
 strum = { workspace = true, features = ["derive"] }
 thiserror.workspace = true

crates/forge/Cargo.toml

@@ -15,15 +15,16 @@ use foundry_compilers::{
 };
 use foundry_config::Config;
 use itertools::Itertools;
-use solar_ast::{
-    ast::{self, Arena, FunctionKind, Span, VarMut},
-    interface::source_map::FileName,
-    visit::Visit,
+use rayon::prelude::*;
+use solar_parse::{
+    ast::{self, interface::source_map::FileName, visit::Visit, Arena, FunctionKind, Span, VarMut},
+    interface::Session,
+    Parser as SolarParser,
 };
-use solar_parse::{interface::Session, Parser as SolarParser};
 use std::{
     collections::{BTreeMap, BTreeSet},
     fmt::{self, Write},
+    ops::ControlFlow,
     path::PathBuf,
     sync::Arc,
 };
@@ -89,9 +90,8 @@ impl BindJsonArgs {
             .1;
 
         let sess = Session::builder().with_stderr_emitter().build();
-        let result = sess.enter(|| -> solar_parse::interface::Result<()> {
-            // TODO: Switch back to par_iter_mut and `enter_parallel` after solar update.
-            sources.0.iter_mut().try_for_each(|(path, source)| {
+        let result = sess.enter_parallel(|| -> solar_parse::interface::Result<()> {
+            sources.0.par_iter_mut().try_for_each(|(path, source)| {
                 let mut content = Arc::try_unwrap(std::mem::take(&mut source.content)).unwrap();
 
                 let arena = Arena::new();
@@ -153,7 +153,12 @@ impl PreprocessorVisitor {
 }
 
 impl<'ast> Visit<'ast> for PreprocessorVisitor {
-    fn visit_item_function(&mut self, func: &'ast ast::ItemFunction<'ast>) {
+    type BreakValue = solar_parse::interface::data_structures::Never;
+
+    fn visit_item_function(
+        &mut self,
+        func: &'ast ast::ItemFunction<'ast>,
+    ) -> ControlFlow<Self::BreakValue> {
         // Replace function bodies with a noop statement.
         if let Some(block) = &func.body {
             if !block.is_empty() {
@@ -169,7 +174,10 @@ impl<'ast> Visit<'ast> for PreprocessorVisitor {
         self.walk_item_function(func)
     }
 
-    fn visit_variable_definition(&mut self, var: &'ast ast::VariableDefinition<'ast>) {
+    fn visit_variable_definition(
+        &mut self,
+        var: &'ast ast::VariableDefinition<'ast>,
+    ) -> ControlFlow<Self::BreakValue> {
         // Remove `immutable` attributes.
         if let Some(VarMut::Immutable) = var.mutability {
             self.updates.push((var.span, ""));

crates/forge/bin/cmd/bind_json.rs

@@ -4,9 +4,11 @@ use foundry_cli::utils::LoadConfig;
 use foundry_compilers::{resolver::parse::SolData, Graph};
 use foundry_config::{impl_figment_convert_basic, Config};
 use itertools::Itertools;
-use solar_ast::visit::Visit;
-use solar_parse::{ast, interface::Session};
-use std::path::{Path, PathBuf};
+use solar_parse::{ast, ast::visit::Visit, interface::Session};
+use std::{
+    ops::ControlFlow,
+    path::{Path, PathBuf},
+};
 
 /// CLI arguments for `forge geiger`.
 #[derive(Clone, Debug, Parser)]
@@ -144,7 +146,9 @@ impl<'a> Visitor<'a> {
 }
 
 impl<'ast> Visit<'ast> for Visitor<'_> {
-    fn visit_expr(&mut self, expr: &'ast ast::Expr<'ast>) {
+    type BreakValue = solar_parse::interface::data_structures::Never;
+
+    fn visit_expr(&mut self, expr: &'ast ast::Expr<'ast>) -> ControlFlow<Self::BreakValue> {
         if let ast::ExprKind::Call(lhs, _args) = &expr.kind {
             if let ast::ExprKind::Member(_lhs, member) = &lhs.kind {
                 if self.unsafe_cheatcodes.iter().any(|c| c.as_str() == member.as_str()) {
@@ -154,6 +158,6 @@ impl<'ast> Visit<'ast> for Visitor<'_> {
                 }
             }
         }
-        self.walk_expr(expr);
+        self.walk_expr(expr)
     }
 }