Merging the changes upstream

Author: JJ

META6.json

@@ -1,7 +1,7 @@
 {
     "perl"        : "6.*",
     "name"        : "Pod::To::HTML",
-    "version"     : "0.3.21",
+    "version"     : "0.3.22",
     "description" : "Convert Perl 6 Pod to HTML",
     "license"     : "Artistic-2.0",
     "depends"     : ["URI"],

lib/Pod/To/HTML.pm

@@ -83,8 +83,8 @@ multi visit($root, :&pre, :&post, :&assemble = -> *% { Nil }) {
 }
 
 class Pod::List is Pod::Block { };
-class Pod::Defn is Pod::Block { };
-
+class Pod::DefnList is Pod::Block { };
+BEGIN { if ::('Pod::Defn') ~~ Failure { CORE::Pod::<Defn> := class {} } }
 
 
 sub assemble-list-items(:@content, :$node, *% ) {
@@ -140,8 +140,8 @@ sub assemble-list-items(:@content, :$node, *% ) {
         # list
         when Pod::Defn {
             $foundone = True;
-            unless +@newcont && @newcont[*-1] ~~ Pod::Defn {
-                @newcont.push(Pod::Defn.new());
+            unless +@newcont && @newcont[*-1] ~~ Pod::DefnList {
+                @newcont.push(Pod::DefnList.new());
             }
             @newcont[*-1].contents.push($_);
         }
@@ -444,7 +444,7 @@ multi sub node2html(Pod::Config $node) {
     return '';
 }
 
-multi sub node2html(Pod::Defn $node ) {
+multi sub node2html(Pod::DefnList $node ) {
     return "<dl>\n" ~ node2html($node.contents) ~ "\n</dl>\n";
 
 }

t/075-defn.t

@@ -1,8 +1,13 @@
 #!perl6
 
 use Test;
+
+# do NOT move this below `Pod::To::HTML` line, the module exports a fake Pod::Defn
+constant no-pod-defn = ::('Pod::Defn') ~~ Failure;
+
 use Pod::To::HTML;
 
+plan :skip-all<Compiler does not support Pod::Defn> if no-pod-defn;
 plan 1;
 
 =begin pod