3.4 backports

.github/workflows/cruby-bindings.yml

@@ -23,6 +23,7 @@ jobs:
         with:
           repository: ruby/ruby
           path: ruby/ruby
+          ref: ruby_3_4
           fetch-depth: 1
       - name: Install libraries
         run: |

.github/workflows/rust-bindings.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Set up Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: "1.91.1"
           targets: wasm32-wasip1
       - uses: actions/cache@v4
         with:
@@ -67,7 +67,7 @@ jobs:
       - name: Set up Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: "1.91.1"
           components: clippy, rustfmt
       - uses: actions/cache@v4
         with:

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prism (1.5.2)
+    prism (1.5.3)
 
 GEM
   remote: https://rubygems.org/
@@ -33,10 +33,10 @@ GEM
       tsort
     ruby_memcheck (3.0.1)
       nokogiri
-    ruby_parser (3.21.1)
+    ruby_parser (3.22.0)
       racc (~> 1.5)
       sexp_processor (~> 4.16)
-    sexp_processor (4.17.4)
+    sexp_processor (4.17.5)
     stringio (3.1.7)
     test-unit (3.7.0)
       power_assert
@@ -59,4 +59,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.5.16
+   4.0.14

config.yml

@@ -17,6 +17,8 @@ errors:
   - ARGUMENT_FORWARDING_UNBOUND
   - ARGUMENT_NO_FORWARDING_AMPERSAND
   - ARGUMENT_NO_FORWARDING_ELLIPSES
+  - ARGUMENT_NO_FORWARDING_ELLIPSES_LAMBDA
+  - ARGUMENT_NO_FORWARDING_ELLIPSES_BLOCK
   - ARGUMENT_NO_FORWARDING_STAR
   - ARGUMENT_NO_FORWARDING_STAR_STAR
   - ARGUMENT_SPLAT_AFTER_ASSOC_SPLAT

ext/prism/extension.h

@@ -1,7 +1,7 @@
 #ifndef PRISM_EXT_NODE_H
 #define PRISM_EXT_NODE_H
 
-#define EXPECTED_PRISM_VERSION "1.5.2"
+#define EXPECTED_PRISM_VERSION "1.5.3"
 
 #include <ruby.h>
 #include <ruby/encoding.h>

gemfiles/2.7/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.2)
+    prism (1.5.3)
 
 GEM
   remote: https://rubygems.org/

gemfiles/3.0/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.2)
+    prism (1.5.3)
 
 GEM
   remote: https://rubygems.org/

gemfiles/3.1/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.2)
+    prism (1.5.3)
 
 GEM
   remote: https://rubygems.org/

gemfiles/3.2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.2)
+    prism (1.5.3)
 
 GEM
   remote: https://rubygems.org/

gemfiles/3.3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.2)
+    prism (1.5.3)
 
 GEM
   remote: https://rubygems.org/

gemfiles/3.4/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.2)
+    prism (1.5.3)
 
 GEM
   remote: https://rubygems.org/

gemfiles/3.5/Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "~> 3.5.0.dev"
+ruby ">= 3.5.0.dev"
 
 gemspec path: "../.."
 

gemfiles/3.5/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.2)
+    prism (1.5.3)
 
 GEM
   remote: https://rubygems.org/
@@ -26,10 +26,10 @@ GEM
       logger
     ruby_memcheck (3.0.1)
       nokogiri
-    ruby_parser (3.21.1)
+    ruby_parser (3.22.0)
       racc (~> 1.5)
       sexp_processor (~> 4.16)
-    sexp_processor (4.17.4)
+    sexp_processor (4.17.5)
     test-unit (3.7.0)
       power_assert
 

gemfiles/jruby/Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "~> 3.4.2", engine: "jruby", engine_version: "~> 10.0.0"
+ruby ">= 3.4.2", engine: "jruby", engine_version: ">= 10.0.0"
 
 gemspec path: "../.."
 

gemfiles/jruby/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.2)
+    prism (1.5.3)
 
 GEM
   remote: https://rubygems.org/

gemfiles/truffleruby/Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "~> 3.3.7", engine: "truffleruby", engine_version: "~> 25.0.0"
+ruby ">= 3.3.7", engine: "truffleruby", engine_version: ">= 25.0.0"
 
 gemspec path: "../.."
 

gemfiles/truffleruby/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.2)
+    prism (1.5.3)
 
 GEM
   remote: https://rubygems.org/

include/prism/version.h

@@ -19,11 +19,11 @@
 /**
  * The patch version of the Prism library as an int.
  */
-#define PRISM_VERSION_PATCH 2
+#define PRISM_VERSION_PATCH 3
 
 /**
  * The version of the Prism library as a constant string.
  */
-#define PRISM_VERSION "1.5.2"
+#define PRISM_VERSION "1.5.3"
 
 #endif

javascript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruby/prism",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Prism Ruby parser",
   "type": "module",
   "main": "src/index.js",

prism.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "prism"
-  spec.version = "1.5.2"
+  spec.version = "1.5.3"
   spec.authors = ["Shopify"]
   spec.email = ["ruby@shopify.com"]
 

rust/ruby-prism-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruby-prism-sys"
-version = "1.5.2"
+version = "1.5.3"
 edition = "2021"
 license-file = "../../LICENSE.md"
 repository = "https://github.com/ruby/prism"

rust/ruby-prism-sys/tests/utils_tests.rs

@@ -12,7 +12,7 @@ fn version_test() {
         CStr::from_ptr(version)
     };
 
-    assert_eq!(&cstring.to_string_lossy(), "1.5.2");
+    assert_eq!(&cstring.to_string_lossy(), "1.5.3");
 }
 
 #[test]

rust/ruby-prism/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruby-prism"
-version = "1.5.2"
+version = "1.5.3"
 edition = "2021"
 license-file = "../../LICENSE.md"
 repository = "https://github.com/ruby/prism"
@@ -26,7 +26,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.9"
 
 [dependencies]
-ruby-prism-sys = { version = "1.5.2", path = "../ruby-prism-sys" }
+ruby-prism-sys = { version = "1.5.3", path = "../ruby-prism-sys" }
 
 [features]
 default = ["vendored"]

rust/ruby-prism/build.rs

@@ -142,10 +142,10 @@ fn struct_name(name: &str) -> String {
     result
 }
 
-fn kind_to_type(kind: &String) -> String {
-    match kind.as_str() {
+fn kind_to_type(kind: &str) -> String {
+    match kind {
         "non-void expression" | "pattern expression" | "Node" => String::new(),
-        _ => kind.to_string(),
+        _ => kind.to_owned(),
     }
 }
 

snapshots/case_in_in.txt

@@ -0,0 +1,78 @@
+@ ProgramNode (location: (1,0)-(4,3))
+├── flags: ∅
+├── locals: [:event]
+└── statements:
+    @ StatementsNode (location: (1,0)-(4,3))
+    ├── flags: ∅
+    └── body: (length: 1)
+        └── @ CaseMatchNode (location: (1,0)-(4,3))
+            ├── flags: newline
+            ├── predicate:
+            │   @ CallNode (location: (1,5)-(1,9))
+            │   ├── flags: variable_call, ignore_visibility
+            │   ├── receiver: ∅
+            │   ├── call_operator_loc: ∅
+            │   ├── name: :args
+            │   ├── message_loc: (1,5)-(1,9) = "args"
+            │   ├── opening_loc: ∅
+            │   ├── arguments: ∅
+            │   ├── closing_loc: ∅
+            │   └── block: ∅
+            ├── conditions: (length: 1)
+            │   └── @ InNode (location: (2,0)-(3,25))
+            │       ├── flags: ∅
+            │       ├── pattern:
+            │       │   @ ArrayPatternNode (location: (2,3)-(2,10))
+            │       │   ├── flags: ∅
+            │       │   ├── constant: ∅
+            │       │   ├── requireds: (length: 1)
+            │       │   │   └── @ LocalVariableTargetNode (location: (2,4)-(2,9))
+            │       │   │       ├── flags: ∅
+            │       │   │       ├── name: :event
+            │       │   │       └── depth: 0
+            │       │   ├── rest: ∅
+            │       │   ├── posts: (length: 0)
+            │       │   ├── opening_loc: (2,3)-(2,4) = "["
+            │       │   └── closing_loc: (2,9)-(2,10) = "]"
+            │       ├── statements:
+            │       │   @ StatementsNode (location: (3,2)-(3,25))
+            │       │   ├── flags: ∅
+            │       │   └── body: (length: 1)
+            │       │       └── @ MatchPredicateNode (location: (3,2)-(3,25))
+            │       │           ├── flags: newline
+            │       │           ├── value:
+            │       │           │   @ CallNode (location: (3,2)-(3,15))
+            │       │           │   ├── flags: ∅
+            │       │           │   ├── receiver:
+            │       │           │   │   @ CallNode (location: (3,2)-(3,9))
+            │       │           │   │   ├── flags: variable_call, ignore_visibility
+            │       │           │   │   ├── receiver: ∅
+            │       │           │   │   ├── call_operator_loc: ∅
+            │       │           │   │   ├── name: :context
+            │       │           │   │   ├── message_loc: (3,2)-(3,9) = "context"
+            │       │           │   │   ├── opening_loc: ∅
+            │       │           │   │   ├── arguments: ∅
+            │       │           │   │   ├── closing_loc: ∅
+            │       │           │   │   └── block: ∅
+            │       │           │   ├── call_operator_loc: (3,9)-(3,10) = "."
+            │       │           │   ├── name: :event
+            │       │           │   ├── message_loc: (3,10)-(3,15) = "event"
+            │       │           │   ├── opening_loc: ∅
+            │       │           │   ├── arguments: ∅
+            │       │           │   ├── closing_loc: ∅
+            │       │           │   └── block: ∅
+            │       │           ├── pattern:
+            │       │           │   @ PinnedVariableNode (location: (3,19)-(3,25))
+            │       │           │   ├── flags: ∅
+            │       │           │   ├── variable:
+            │       │           │   │   @ LocalVariableReadNode (location: (3,20)-(3,25))
+            │       │           │   │   ├── flags: ∅
+            │       │           │   │   ├── name: :event
+            │       │           │   │   └── depth: 0
+            │       │           │   └── operator_loc: (3,19)-(3,20) = "^"
+            │       │           └── operator_loc: (3,16)-(3,18) = "in"
+            │       ├── in_loc: (2,0)-(2,2) = "in"
+            │       └── then_loc: ∅
+            ├── else_clause: ∅
+            ├── case_keyword_loc: (1,0)-(1,4) = "case"
+            └── end_keyword_loc: (4,0)-(4,3) = "end"