fix(fmt): 'layout' is not a keyword (backport to 1.2.2) (#10669)

* fix(fmt): 'layout' is not a keyword (#10656)

* chore: bump version to 1.2.2 (#10668)

* ci: use Optimism mainnet instead of DRPC due to limits (#10592)

use Optimism mainnet instead of DRPC due to limits

---------

Co-authored-by: DaniPopes <[email protected]>
Co-authored-by: zerosnacks <[email protected]>

Author: 3 people

Cargo.lock

@@ -27,7 +27,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "1.2.1"
+version = "1.2.2"
 edition = "2021"
 # Remember to update clippy.toml as well
 rust-version = "1.83"
@@ -191,7 +191,7 @@ foundry-linking = { path = "crates/linking" }
 foundry-block-explorers = { version = "0.13.3", default-features = false }
 foundry-compilers = { version = "0.14.0", default-features = false }
 foundry-fork-db = "0.12"
-solang-parser = { version = "=0.3.8", package = "foundry-solang-parser" }
+solang-parser = { version = "=0.3.9", package = "foundry-solang-parser" }
 solar-parse = { version = "=0.1.2", default-features = false }
 solar-sema = { version = "=0.1.2", default-features = false }
 

Cargo.toml

@@ -1,13 +1,13 @@
 struct S {
     uint256 error;
-    // uint256 layout;
+    uint256 layout;
     uint256 at;
 }
 // uint256 transient;
 
 function f() {
     uint256 error = 0;
-    // uint256 layout = 0;
+    uint256 layout = 0;
     uint256 at = 0;
     // uint256 transient = 0;
 
@@ -17,25 +17,26 @@ function f() {
     // transient = 0;
 
     S memory x = S({
+        // format
         error: 0,
-        // layout: 0,
+        layout: 0,
         at: 0
     });
     // transient: 0
 
     x.error = 0;
-    // x.layout = 0;
+    x.layout = 0;
     x.at = 0;
     // x.transient = 0;
 
     assembly {
         let error := 0
-        // let layout := 0
+        let layout := 0
         let at := 0
         // let transient := 0
 
         error := 0
-        // layout := 0
+        layout := 0
         at := 0
         // transient := 0
     }

crates/fmt/testdata/NonKeywords/fmt.sol

@@ -1,13 +1,13 @@
 struct S {
     uint256 error;
-    // uint256 layout;
+    uint256 layout;
     uint256 at;
     // uint256 transient;
 }
 
 function f() {
     uint256 error = 0;
-    // uint256 layout = 0;
+    uint256 layout = 0;
     uint256 at = 0;
     // uint256 transient = 0;
 
@@ -17,25 +17,26 @@ function f() {
     // transient = 0;
 
     S memory x = S({
+        // format
         error: 0,
-        // layout: 0,
+        layout: 0,
         at: 0
         // transient: 0
     });
 
     x.error = 0;
-    // x.layout = 0;
+    x.layout = 0;
     x.at = 0;
     // x.transient = 0;
 
     assembly {
         let error := 0
-        // let layout := 0
+        let layout := 0
         let at := 0
         // let transient := 0
 
         error := 0
-        // layout := 0
+        layout := 0
         at := 0
         // transient := 0
     }