rbs 4.0.1 → 4.1.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cef77dc4a4c3abe7192ddcd40da72ec04727c214031893d20f70388ed427340c
-  data.tar.gz: c2f8cb98f97f6fa3961a0da6fdcf5de657fa2aed7e1372a9973ff47613372194
+  metadata.gz: ef0d5eb6481b99be0816dbcef78f1cc40371104f4ef3e82b40ffcbbc3e78dccc
+  data.tar.gz: a728bc39e8ef49146542b121956fc5555d8eecb066febe271bb04b0beaf56ea3
 SHA512:
-  metadata.gz: d43c6ab7581b9e5c317743f14430edb8afb1f3b71dbf35cd0b28b876981c0fc49b78eef11bd7ae745a181c720d0eb2b5bc0a95e02aa40f070d31f3951730953f
-  data.tar.gz: 43b3322fec01f1cf126bbd3df6843a0054c3c5196eeecbab593f5c62c7b8ae188a126ef8bbfa160a434ce7ed5f47f1cba0cf87057de1b027c8d03fd7ef249800
+  metadata.gz: d0a018f3245ae90e747f649b1e306edf8084147a3db4138b929a74736b86fe8f404b3e0d4aef35b212bf8da149e4d7b0088d22b5c1bd27a006aed253dec82d88
+  data.tar.gz: 65a1efb7bc0484e7744c7df1ef70c193918f5a5d5690c00bdadcb5b29bbf8b5b18719643e31b6ea93b2a4ae56874965b5116f43de1569deb5ff24b96e221a7c7

data/.github/dependabot.yml

@@ -20,3 +20,5 @@ updates:
     directory: '/'
     schedule:
       interval: 'weekly'
+    labels:
+      - 'no-milestone'

data/.github/workflows/bundle-update.yml

@@ -57,4 +57,7 @@ jobs:
             --title "bundle update ($(date +'%Y-%m-%d'))" \
             --body "Automated weekly bundle update" \
             --head "$(git rev-parse --abbrev-ref HEAD)" \
-            --base "${{ github.event.repository.default_branch }}"
+            --base "${{ github.event.repository.default_branch }}" \
+            --label "no-milestone"
+
+          gh pr merge --auto --merge "$(git rev-parse --abbrev-ref HEAD)"

data/.github/workflows/dependabot.yml

@@ -14,7 +14,7 @@ jobs:
     if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
     steps:
       - name: Dependabot metadata
-        uses: dependabot/fetch-metadata@21025c705c08248db411dc16f3619e6b5f9ea21a # v2.5.0
+        uses: dependabot/fetch-metadata@ffa630c65fa7e0ecfa0625b5ceda64399aea1b36 # v3.0.0
         id: metadata
       - name: Checkout repository
         uses: actions/checkout@v6

data/.github/workflows/milestone.yml

@@ -0,0 +1,80 @@
+name: Check milestone
+
+on:
+  pull_request:
+    types: [opened, edited, labeled, unlabeled, milestoned, demilestoned, synchronize]
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Extract RBS::Version
+        id: version
+        run: |
+          # Extract version string from lib/rbs/version.rb
+          version=$(ruby -e 'load "lib/rbs/version.rb"; print RBS::VERSION')
+          echo "version=$version" >> "$GITHUB_OUTPUT"
+
+          # Parse major.minor.patch
+          IFS='.' read -r major minor patch _rest <<< "$version"
+          echo "major=$major" >> "$GITHUB_OUTPUT"
+          echo "minor=$minor" >> "$GITHUB_OUTPUT"
+          echo "patch=$patch" >> "$GITHUB_OUTPUT"
+
+          echo "RBS::VERSION = $version (major=$major, minor=$minor, patch=$patch)"
+
+      - name: Check milestone
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const pr = context.payload.pull_request;
+            const milestone = pr.milestone;
+            const labels = pr.labels.map(l => l.name);
+
+            const version = '${{ steps.version.outputs.version }}';
+            const major = '${{ steps.version.outputs.major }}';
+            const minor = '${{ steps.version.outputs.minor }}';
+            const patch = parseInt('${{ steps.version.outputs.patch }}', 10);
+
+            if (!milestone) {
+              if (labels.includes('no-milestone')) {
+                core.info('No milestone set, but no-milestone label is present — OK');
+                return;
+              }
+              core.setFailed(
+                'No milestone set. Add a milestone or add the "no-milestone" label.'
+              );
+              return;
+            }
+
+            if (labels.includes('no-milestone')) {
+              core.setFailed(
+                'Milestone is set but "no-milestone" label is present. Remove the label or the milestone.'
+              );
+              return;
+            }
+
+            const milestoneName = milestone.title;
+            core.info(`Milestone: "${milestoneName}", RBS::VERSION: ${version}`);
+
+            // Expected milestone based on version:
+            //   patch == 0 → "RBS major.minor"   (e.g. "RBS 4.0")
+            //   patch >= 1 → "RBS major.minor.x"  (e.g. "RBS 4.0.x")
+            let expectedMilestone;
+            if (patch === 0) {
+              expectedMilestone = `RBS ${major}.${minor}`;
+            } else {
+              expectedMilestone = `RBS ${major}.${minor}.x`;
+            }
+
+            if (milestoneName !== expectedMilestone) {
+              core.setFailed(
+                `Milestone "${milestoneName}" does not match RBS::VERSION ${version}. ` +
+                `Expected milestone: "${expectedMilestone}"`
+              );
+            } else {
+              core.info(`Milestone "${milestoneName}" matches RBS::VERSION ${version}`);
+            }

data/.github/workflows/ruby.yml

@@ -110,3 +110,37 @@ jobs:
         run: |
           bin/setup
       - run: bundle exec rake clean compile_c99
+
+  clang_compile:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['4.0', head]
+    steps:
+      - uses: actions/checkout@v6
+      - name: Install dependencies
+        run: |
+          brew install ruby-build
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: none
+      - name: Set working directory as safe
+        run: git config --global --add safe.directory $(pwd)
+      - name: Update rubygems & bundler
+        run: |
+          ruby -v
+          gem update --system
+      - name: install erb
+        run: gem install erb
+      - name: clang version
+        run: clang --version
+      - name: bundle config set force_ruby_platform true if head
+        if: ${{ contains(matrix.ruby, 'head') }}
+        run: |
+          bundle config set force_ruby_platform true
+      - name: bin/setup
+        run: |
+          bin/setup
+      - run: bundle exec rake clean compile

data/.github/workflows/rust.yml

@@ -8,8 +8,6 @@ on:
     paths:
       - ".github/workflows/rust.yml"
       - "rust/**"
-      - "include/**"
-      - "src/**"
 
 env:
   RUSTFLAGS: "-D warnings"
@@ -24,6 +22,20 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - uses: actions/checkout@v6
+      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ruby
+          bundler: none
+      - name: Update rubygems & bundler
+        run: gem update --system
+      - name: Install gems
+        run: |
+          bundle config set --local without libs:profilers
+          bundle install --jobs 4 --retry 3
+      - name: Set up vendored RBS source
+        run: bundle exec rake rust:rbs:sync
       - name: Install Rust tools
         run: |
           rustup update --no-self-update stable
@@ -42,12 +54,30 @@ jobs:
           cd rust
           cargo test --verbose
 
-  publish-dry-run:
-    name: cargo:publish-dry-run
+  publish-dry-run-ruby-rbs-sys:
+    name: rust:publish:ruby-rbs-sys
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
       - uses: actions/checkout@v6
+      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      - name: Set up git identity
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ruby
+          bundler: none
+      - name: Update rubygems & bundler
+        run: gem update --system
+      - name: Install gems
+        run: |
+          bundle config set --local without libs:profilers
+          bundle install --jobs 4 --retry 3
+      - name: Set up vendored RBS source
+        run: bundle exec rake rust:rbs:sync
       - name: Install Rust tools
         run: |
           rustup update --no-self-update stable
@@ -61,16 +91,72 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('rust/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-cargo-
-      - name: Test publish crates
+      - name: Test publish ruby-rbs-sys
+        run: bundle exec rake rust:publish:ruby-rbs-sys
+        env:
+          RBS_RUST_PUBLISH_DRY_RUN: "1"
+
+  publish-dry-run-ruby-rbs:
+    name: rust:publish:ruby-rbs
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v6
+      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      - name: Set up git identity
         run: |
-          cd rust
-          cargo publish --dry-run
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ruby
+          bundler: none
+      - name: Update rubygems & bundler
+        run: gem update --system
+      - name: Install gems
+        run: |
+          bundle config set --local without libs:profilers
+          bundle install --jobs 4 --retry 3
+      - name: Set up vendored RBS source
+        run: bundle exec rake rust:rbs:sync
+      - name: Install Rust tools
+        run: |
+          rustup update --no-self-update stable
+          rustup default stable
+      - uses: actions/cache@v5
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            rust/target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('rust/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
+      - name: Test publish ruby-rbs
+        run: bundle exec rake rust:publish:ruby-rbs
+        env:
+          RBS_RUST_PUBLISH_DRY_RUN: "1"
 
   lint:
     name: cargo:lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ruby
+          bundler: none
+      - name: Update rubygems & bundler
+        run: gem update --system
+      - name: Install gems
+        run: |
+          bundle config set --local without libs:profilers
+          bundle install --jobs 4 --retry 3
+      - name: Set up vendored RBS source
+        run: bundle exec rake rust:rbs:sync
       - name: Install Rust tools
         run: |
           rustup update --no-self-update stable

data/.gitignore

@@ -25,3 +25,7 @@ doc/
 # For clangd's editor integration
 ext/rbs_extension/compile_commands.json
 ext/rbs_extension/.cache
+
+# Rust crate vendored RBS source (managed by rake rust:rbs:sync or rust:rbs:symlink)
+rust/ruby-rbs-sys/vendor/rbs/
+rust/ruby-rbs/vendor/rbs/

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 4.0.2 (2026-03-25)
+
+### Library changes
+
+#### rbs collection
+
+* Fix: pathname not written to lockfile. ([#2889](https://github.com/ruby/rbs/pull/2889))
+
+### Miscellaneous
+
+* Fix test failure on Windows in `ruby/ruby` ([#2900](https://github.com/ruby/rbs/pull/2900))
+* Fix test for Ruby 4.1 ([#2899](https://github.com/ruby/rbs/pull/2899))
+
 ## 4.0.1 (2026-03-23)
 
 This is a minor release to fix Ruby CI failure, which was caused by symlinks included in the `rust` directory.
@@ -221,6 +234,14 @@ This release also introduces two language changes: type argument support for sin
 * Skip loading ruby_memcheck ([#2349](https://github.com/ruby/rbs/pull/2349))
 * Forcibly uninstall gems even if there is a dependency problem. ([#2346](https://github.com/ruby/rbs/pull/2346))
 
+## 3.10.4 (2026-03-25)
+
+### Library changes
+
+#### rbs collection
+
+* [Backport] [3.10] Fix: pathname not written to lockfile. ([#2896](https://github.com/ruby/rbs/pull/2896))
+
 ## 3.10.3 (2026-01-30)
 
 This is a minor fix around the dependency to `tsort`.

data/Rakefile

@@ -199,12 +199,15 @@ task :validate => :compile do
     libs << "rbs"
   end
 
+  libs.delete("bigdecimal-math") or raise
+  libs.delete("bigdecimal") or raise
+
   libs.each do |lib|
     args = ["-r", lib]
 
     if lib == "rbs"
-      args << "-r"
-      args << "prism"
+      args << "-r" << "prism"
+      args << "-r" << "logger"
     end
 
     sh "#{ruby} #{rbs} #{args.join(' ')} validate"
@@ -545,3 +548,207 @@ task :prepare_profiling do
   Rake::Task[:"templates"].invoke
   Rake::Task[:"compile"].invoke
 end
+
+namespace :rust do
+  namespace :rbs do
+    RUST_DIR = File.expand_path("rust", __dir__)
+    RBS_VERSION_FILE = File.join(RUST_DIR, "rbs_version")
+
+    VENDOR_TARGETS = {
+      "ruby-rbs-sys" => %w[include src],
+      "ruby-rbs" => %w[config.yml],
+    }
+
+    desc "Sync vendored RBS source from the pinned version"
+    task :sync do
+      unless File.exist?(RBS_VERSION_FILE)
+        raise "#{RBS_VERSION_FILE} not found. Run `rake rust:rbs:pin[VERSION]` first."
+      end
+
+      version = File.read(RBS_VERSION_FILE).strip
+      raise "#{RBS_VERSION_FILE} is empty" if version.empty?
+
+      puts "Syncing vendor/rbs/ from #{version}..."
+
+      VENDOR_TARGETS.each do |crate, entries|
+        vendor_dir = File.join(RUST_DIR, crate, "vendor", "rbs")
+
+        puts "  Copying files for #{crate}:"
+        chmod_R "u+w", vendor_dir, verbose: false if File.exist?(vendor_dir)
+        rm_rf vendor_dir, verbose: false
+        mkdir_p vendor_dir, verbose: false
+
+        entries.each do |entry|
+          target = File.join(vendor_dir, entry)
+
+          # Extract the entry from the pinned git tag using git archive
+          IO.popen(["git", "archive", "--format=tar", version, "--", entry], "rb") do |tar|
+            IO.popen(["tar", "xf", "-", "-C", vendor_dir], "wb") do |extract|
+              IO.copy_stream(tar, extract)
+            end
+          end
+
+          raise "Failed to extract #{entry} from #{version}" unless File.exist?(target)
+          puts "    #{entry}"
+        end
+
+        # Make files read-only to prevent accidental edits
+        chmod_R "a-w", vendor_dir, verbose: false
+      end
+
+      puts "📦 Synced vendor/rbs/ from #{version} (read-only)"
+    end
+
+    desc "Pin a specific RBS version for Rust crates (e.g., rake rust:rbs:pin[v4.0.3])"
+    task :pin, [:version] do |_t, args|
+      version = args[:version] or raise "Usage: rake rust:rbs:pin[VERSION]"
+
+      # Verify the tag exists
+      unless system("git", "rev-parse", "--verify", "#{version}^{commit}", out: File::NULL, err: File::NULL)
+        raise "Tag #{version} not found"
+      end
+
+      File.write(RBS_VERSION_FILE, "#{version}\n")
+      puts "📌 Pinned RBS version to #{version}"
+
+      Rake::Task["rust:rbs:sync"].invoke
+    end
+
+    desc "Create symlinks from vendor/rbs/ to the repository root (for development/CI)"
+    task :symlink do
+      VENDOR_TARGETS.each do |crate, entries|
+        vendor_dir = File.join(RUST_DIR, crate, "vendor", "rbs")
+
+        puts "Setting up symlinks for #{crate}..."
+        entries.each do |entry|
+          puts "  #{entry} -> repository root"
+        end
+
+        chmod_R "u+w", vendor_dir, verbose: false if File.exist?(vendor_dir)
+        rm_rf vendor_dir, verbose: false
+        mkdir_p vendor_dir, verbose: false
+
+        entries.each do |entry|
+          ln_s File.join("..", "..", "..", "..", entry), File.join(vendor_dir, entry), verbose: false
+        end
+      end
+
+      puts "🔗 Symlinked vendor/rbs/ to repository root"
+    end
+  end
+
+  namespace :publish do
+    def self.prepare_publish_branch(crate_name)
+      dry_run = ENV["RBS_RUST_PUBLISH_DRY_RUN"]
+
+      version_file = File.join(RUST_DIR, "rbs_version")
+
+      unless File.exist?(version_file)
+        raise "#{version_file} not found. Run `rake rust:rbs:pin[VERSION]` first."
+      end
+
+      rbs_version = File.read(version_file).strip
+      raise "#{version_file} is empty" if rbs_version.empty?
+
+      crate_version = File.read(File.join(RUST_DIR, crate_name, "Cargo.toml"))[/^version\s*=\s*"(.+)"/, 1]
+      release_branch = "rust/release-#{crate_name}-#{Time.now.strftime('%Y%m%d%H%M%S')}"
+
+      puts "=" * 60
+      puts "Rust crate publish: #{crate_name}#{dry_run ? " (DRY RUN)" : ""}"
+      puts "=" * 60
+      puts "  RBS source version:  #{rbs_version}"
+      puts "  #{crate_name}:        #{crate_version} (tag: #{crate_name}-v#{crate_version})"
+      puts "  Release branch:      #{release_branch}"
+      puts "=" * 60
+
+      # Check that vendor dirs contain real files, not symlinks
+      entries = VENDOR_TARGETS.fetch(crate_name)
+      entries.each do |entry|
+        path = File.join(RUST_DIR, crate_name, "vendor", "rbs", entry)
+        if File.symlink?(path)
+          raise "#{path} is a symlink. Run `rake rust:rbs:sync` first."
+        end
+        unless File.exist?(path)
+          raise "#{path} does not exist. Run `rake rust:rbs:sync` first."
+        end
+      end
+
+      # Ensure working tree is clean before publishing
+      unless `git status --porcelain`.strip.empty?
+        raise "💢 Working tree is dirty. Please commit or stash your changes before publishing."
+      end
+
+      # Create a release branch with vendor files committed
+      original_branch = `git rev-parse --abbrev-ref HEAD`.strip
+
+      sh "git", "checkout", "-b", release_branch, verbose: false
+      vendor_path = File.join("rust", crate_name, "vendor", "rbs")
+      sh "git", "add", "-f", vendor_path, verbose: false
+      sh "git", "commit", "-m", "Publish #{crate_name} (RBS #{rbs_version})", verbose: false
+
+      [dry_run, crate_version, original_branch]
+    end
+
+    desc "Publish ruby-rbs-sys crate to crates.io (set RBS_RUST_PUBLISH_DRY_RUN=1 for dry-run only)"
+    task :"ruby-rbs-sys" do
+      crate_name = "ruby-rbs-sys"
+      dry_run, crate_version, original_branch = prepare_publish_branch(crate_name)
+
+      begin
+        puts "🔰 Dry-run publishing..."
+
+        Dir.chdir(File.join(RUST_DIR, crate_name)) do
+          sh "cargo", "publish", "--dry-run"
+        end
+
+        puts "✅ Dry-run succeeded!"
+
+        unless dry_run
+          puts "💪 Publishing #{crate_name} for real..."
+
+          Dir.chdir(File.join(RUST_DIR, crate_name)) do
+            sh "cargo", "publish"
+          end
+
+          sh "git", "tag", "#{crate_name}-v#{crate_version}"
+          sh "git", "push", "origin", "#{crate_name}-v#{crate_version}"
+
+          puts "🎉 Published #{crate_name} successfully!"
+        end
+      ensure
+        sh "git", "checkout", original_branch, verbose: false
+      end
+    end
+
+    desc "Publish ruby-rbs crate to crates.io (set RBS_RUST_PUBLISH_DRY_RUN=1 for dry-run only)"
+    task :"ruby-rbs" do
+      crate_name = "ruby-rbs"
+      dry_run, crate_version, original_branch = prepare_publish_branch(crate_name)
+
+      begin
+        puts "🔰 Dry-run publishing..."
+
+        Dir.chdir(File.join(RUST_DIR, crate_name)) do
+          sh "cargo", "publish", "--dry-run", "--no-verify"
+        end
+
+        puts "✅ Dry-run succeeded!"
+
+        unless dry_run
+          puts "💪 Publishing #{crate_name} for real..."
+
+          Dir.chdir(File.join(RUST_DIR, crate_name)) do
+            sh "cargo", "publish"
+          end
+
+          sh "git", "tag", "#{crate_name}-v#{crate_version}"
+          sh "git", "push", "origin", "#{crate_name}-v#{crate_version}"
+
+          puts "🎉 Published #{crate_name} successfully!"
+        end
+      ensure
+        sh "git", "checkout", original_branch, verbose: false
+      end
+    end
+  end
+end

data/config.yml

@@ -784,6 +784,30 @@ nodes:
       - name: type_name_location
         c_type: rbs_location_range
         optional: true
+  - name: RBS::AST::Ruby::Annotations::ModuleSelfAnnotation
+    rust_name: ModuleSelfAnnotationNode
+    fields:
+      - name: prefix_location
+        c_type: rbs_location_range
+      - name: keyword_location
+        c_type: rbs_location_range
+      - name: colon_location
+        c_type: rbs_location_range
+      - name: name
+        c_type: rbs_type_name
+      - name: args
+        c_type: rbs_node_list
+      - name: open_bracket_location
+        c_type: rbs_location_range
+        optional: true
+      - name: close_bracket_location
+        c_type: rbs_location_range
+        optional: true
+      - name: args_comma_locations
+        c_type: rbs_location_range_list
+      - name: comment_location
+        c_type: rbs_location_range
+        optional: true
   - name: RBS::AST::Ruby::Annotations::ParamTypeAnnotation
     rust_name: ParamTypeAnnotationNode
     fields:

data/core/builtin.rbs

@@ -225,6 +225,7 @@ type int = Integer | _ToInt
 
 # Represents a `Float`, or a type convertible to it (via `.to_f`).
 #
+%a{deprecated: Use `_ToF` directly}
 type float = Float | _ToF
 
 # Represents a `Range[T]`, or a type that acts like it (via `.begin`, `.end`, and `.exclude_end?`).

data/core/class.rbs

@@ -83,7 +83,7 @@ class Class < Module
   # Assign the class to a constant (name starting uppercase) if you want to treat
   # it like a regular class.
   #
-  def initialize: (?Class superclass) ?{ (Class newclass) -> void } -> void
+  def initialize: (?Class superclass) ?{ (Class newclass) [self: Class] -> void } -> void
 
   # <!--
   #   rdoc-file=object.c
@@ -107,6 +107,8 @@ class Class < Module
   #
   def allocate: () -> untyped
 
+  def self.allocate: () -> untyped
+
   # <!--
   #   rdoc-file=object.c
   #   - attached_object -> object
@@ -150,7 +152,7 @@ class Class < Module
   #     New subclass: Bar
   #     New subclass: Baz
   #
-  def inherited: (Class arg0) -> untyped
+  private def inherited: (Class subclass) -> void
 
   # <!--
   #   rdoc-file=object.c
@@ -160,7 +162,7 @@ class Class < Module
   # object's #initialize method, passing it *args*.  This is the method that ends
   # up getting called whenever an object is constructed using <code>.new</code>.
   #
-  def new: () -> untyped
+  def new: (*untyped, **untyped) ?{ (?) -> untyped } -> untyped
 
   # <!--
   #   rdoc-file=object.c