yard-rustdoc 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78e74a92126b3580032529eaa4f17361eb6d4dd885b1dcb42ce1ccae71afa130
-  data.tar.gz: c978d783880150a402baf41aca076ca0a736c988b32e6283ac953ca0b86c0377
+  metadata.gz: 24b060b8f18e6f3eb16b1db6b9db45d2460b06c5205fdd912439e556e827db4d
+  data.tar.gz: 4c7d1df433e0f8592d4662ca7c3234c57b135cc9d4b1a840be722198788e3910
 SHA512:
-  metadata.gz: 50e53c9f30f82fd56bfa040176b127ac72cb5015463a5d738a01a73814fba8ba984862b3ac0b81968063654d0031237a390878073edd50a1978505df911f30b8
-  data.tar.gz: 53743f0a93ada894d5532d7d86d57cd88a6e68446f8c065582012cae96c02431f995c4146049c36e893b4912691ce9d5635bf89ab7d5c2d46ec2f8e469028e0b
+  metadata.gz: 752fbc1a18f3221cd014a418411feee0bd34292e27a536bc9834c979d9abe251067fce9d917de6917fca16e4095e3e2bfa7791c1b2babf6d5095377351dbd039
+  data.tar.gz: a4335f3a4d0db31b84d2c61125d27c0cf2c015327821ac6912c141ea9bf8ffbec7c3e9e594438cf91498982eb6a8be864efbc9652f74d281e9fcddff85ef0983

data/lib/yard-rustdoc/parser.rb

@@ -40,9 +40,11 @@ module YARD::Parser::Rustdoc
 
         methods = inner
           .fetch("impls")
-          .flat_map { |impl_id| @rustdoc_json.dig(impl_id, "inner", "impl", "items") }
+          .flat_map do |impl_id|
+            @rustdoc_json.dig(impl_id.to_s, "inner", "impl", "items")
+          end
           .filter_map do |method_id|
-            method_entry = @rustdoc_json.fetch(method_id)
+            method_entry = @rustdoc_json.fetch(method_id.to_s)
             next unless relevant_entry?(method_entry)
 
             Statements::Method.new(method_entry)
@@ -52,7 +54,7 @@ module YARD::Parser::Rustdoc
       end
 
       # Ensure Foo comes before Foo::Bar
-      @entries.sort! { |a, b| a.name <=> b.name }
+      @entries.sort_by!(&:name)
 
       self
     end

data/lib/yard-rustdoc/statements.rb

@@ -73,6 +73,8 @@ module YARD::Parser::Rustdoc
         return $1.strip if docstring =~ /^@rename\s*(.+)/
 
         @rustdoc["attrs"].each do |attr|
+          attr = attr["other"] if attr.is_a?(Hash) # JSON rustdoc FORMAT_VERSION v54
+
           next unless attr.include?("magnus")
 
           # Extract class name from magnus attrs that define classes such as:
@@ -104,8 +106,13 @@ module YARD::Parser::Rustdoc
       # Infers the scope (instance vs class) based on the usage of "self" or
       # "rb_self" as an arg name.
       def scope
-        arg_names = @rustdoc
-          .dig("inner", "function", "decl", "inputs")
+        inputs =
+          # JSON rustdoc FORMAT_VERSION < 34
+          @rustdoc.dig("inner", "function", "decl", "inputs") ||
+          # >= 34
+          @rustdoc.dig("inner", "function", "sig", "inputs")
+
+        arg_names = inputs
           .map(&:first)
           .slice(0, 2) # Magnus may inject a Ruby handle as arg0, hence we check 2 args
 

data/lib/yard-rustdoc/version.rb

@@ -2,6 +2,6 @@
 
 module YARD
   module Rustdoc
-    VERSION = "0.4.0"
+    VERSION = "0.4.2"
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: yard-rustdoc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Jimmy Bourassa
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -30,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +79,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-description:
 email:
 - jbourassa@gmail.com
 executables: []
@@ -100,7 +98,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/oxidize-rb/yard-rustdoc
   source_code_uri: https://github.com/oxidize-rb/yard-rustdoc
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Generate YARD documentation for Magnus-based Rust gems.
 test_files: []