chore(deps): bump solar, compilers

Cargo.toml

@@ -203,15 +203,13 @@ foundry-wallets = { path = "crates/wallets" }
 foundry-linking = { path = "crates/linking" }
 
 # solc & compilation utilities
-foundry-block-explorers = { version = "0.20.0", default-features = false }
-foundry-compilers = { version = "0.18.3", default-features = false }
+foundry-block-explorers = { version = "0.21.0", default-features = false }
+foundry-compilers = { version = "0.19.0", default-features = false }
 foundry-fork-db = "0.18"
 solang-parser = { version = "=0.3.9", package = "foundry-solang-parser" }
-solar-ast = { version = "=0.1.5", default-features = false }
-solar-parse = { version = "=0.1.5", default-features = false }
-solar-interface = { version = "=0.1.5", default-features = false }
-solar-sema = { version = "=0.1.5", default-features = false }
-solar-data-structures = { version = "=0.1.5", default-features = false }
+solar = { package = "solar-compiler", version = "=0.1.6", default-features = false }
+# TODO: remove in next solar release: https://github.com/paradigmxyz/solar/pull/444
+solar-interface = { version = "=0.1.6", default-features = false }
 
 ## alloy
 alloy-consensus = { version = "1.0.23", default-features = false }
@@ -414,8 +412,4 @@ idna_adapter = "=1.1.0"
 # foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "eee6563" }
 
 ## solar
-# solar-ast = { git = "https://github.com/paradigmxyz/solar.git", branch = "main" }
-# solar-parse = { git = "https://github.com/paradigmxyz/solar.git", branch = "main" }
-# solar-interface = { git = "https://github.com/paradigmxyz/solar.git", branch = "main" }
-# solar-sema = { git = "https://github.com/paradigmxyz/solar.git", branch = "main" }
-# solar-data-structures = { git = "https://github.com/paradigmxyz/solar.git", branch = "main" }
+# solar = { package = "solar-compiler", git = "https://github.com/paradigmxyz/solar.git", branch = "main" }

crates/chisel/Cargo.toml

@@ -49,7 +49,7 @@ semver.workspace = true
 serde_json.workspace = true
 serde.workspace = true
 solang-parser.workspace = true
-solar-parse.workspace = true
+solar.workspace = true
 strum = { workspace = true, features = ["derive"] }
 time = { version = "0.3", features = ["formatting"] }
 yansi.workspace = true

crates/chisel/src/solidity_helper.rs

@@ -14,7 +14,7 @@ use rustyline::{
     hint::Hinter,
     validate::{ValidationContext, ValidationResult, Validator},
 };
-use solar_parse::{
+use solar::parse::{
     Lexer,
     interface::Session,
     token::{Token, TokenKind},
@@ -173,7 +173,7 @@ impl SolidityHelper {
 
     /// Enters the session.
     fn enter(&self, f: impl FnOnce(&Session)) {
-        self.sess.enter(|| f(&self.sess));
+        self.sess.enter_sequential(|| f(&self.sess));
     }
 }
 
@@ -238,7 +238,7 @@ impl Helper for SolidityHelper {}
 #[expect(non_upper_case_globals)]
 #[deny(unreachable_patterns)]
 fn token_style(token: &Token) -> Style {
-    use solar_parse::{
+    use solar::parse::{
         interface::kw::*,
         token::{TokenKind::*, TokenLitKind::*},
     };

crates/cli/Cargo.toml

@@ -22,7 +22,7 @@ foundry-wallets.workspace = true
 foundry-block-explorers.workspace = true
 
 foundry-compilers = { workspace = true, features = ["full"] }
-solar-sema.workspace = true
+solar.workspace = true
 
 alloy-eips.workspace = true
 alloy-dyn-abi.workspace = true

crates/cli/src/opts/build/mod.rs

@@ -9,7 +9,7 @@ mod paths;
 pub use self::paths::ProjectPathOpts;
 
 mod utils;
-pub use self::utils::{solar_pcx_from_build_opts, solar_pcx_from_solc_project};
+pub use self::utils::{configure_pcx, configure_pcx_from_solc};
 
 // A set of solc compiler settings that can be set via command line arguments, which are intended
 // to be merged into an existing `foundry_config::Config`.