Add CompUnit.api attribute and add usage where applicable

It appears to have been missed before.
rakudo · Apr 17, 2022 · f4fe38b · f4fe38b
1 parent 64328d4
commit f4fe38b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/core.c/CompUnit.pm6 b/src/core.c/CompUnit.pm6
@@ -5,6 +5,7 @@ class CompUnit {
     has Str:D   $.short-name is built(:bind) is required;
     has Version $.version    is built(:bind);
     has Str     $.auth       is built(:bind);
+    has Version $.api        is built(:bind);
 
     # The CompUnit::Repository that loaded this CompUnit.
     has CompUnit::Repository:D $.repo is built(:bind) is required;
@@ -32,6 +33,7 @@ class CompUnit {
           nqp::list_s($!from,$!short-name,$!repo-id,$!precompiled.Str);
         nqp::push_s($parts,$!version.Str)      if $!version;
         nqp::push_s($parts,$!auth)             if $!auth;
+        nqp::push_s($parts,$!api.Str)          if $!api;
         nqp::push_s($parts,$!distribution
           ?? CompUnit::Repository::Distribution.new(
                $!distribution,

diff --git a/src/core.c/CompUnit/Repository/Installation.pm6 b/src/core.c/CompUnit/Repository/Installation.pm6
@@ -547,16 +547,17 @@ sub MAIN(:$name, :$auth, :$ver, *@, *%) {
     }
 
     method resolve(CompUnit::DependencySpecification:D $spec --> CompUnit:D) {
-        with self!matching-dist($spec) {
-            my %meta := .meta;
+        if self!matching-dist($spec) -> $distribution {
+            my %meta := $distribution.meta;
             CompUnit.new(
               :handle(CompUnit::Handle),
               :short-name($spec.short-name),
               :version(%meta<ver>),
-              :auth(%meta<auth> // Str),
+              :auth(%meta<auth>),
+              :api(%meta<api>),
               :repo(self),
               :repo-id(%meta<source>),
-              :distribution($_),
+              :$distribution,
             )
         }
         elsif self.next-repo -> $next-repo {
@@ -635,7 +636,8 @@ sub MAIN(:$name, :$auth, :$ver, *@, *%) {
                       :$handle,
                       :short-name($spec.short-name),
                       :version(%meta<ver>),
-                      :auth(%meta<auth> // Str),
+                      :auth(%meta<auth>),
+                      :api(%meta<api>),
                       :repo(self),
                       :$repo-id,
                       :precompiled,
@@ -651,7 +653,8 @@ sub MAIN(:$name, :$auth, :$ver, *@, *%) {
                       :$handle,
                       :short-name($spec.short-name),
                       :version(%meta<ver>),
-                      :auth(%meta<auth> // Str),
+                      :auth(%meta<auth>),
+                      :api(%meta<api>),
                       :repo(self),
                       :$repo-id,
                       :$distribution,