Fix merge issues, remove excess files - match perl-5.24.1 dist

1 files changed, 22 insertions, 22 deletions

diff --git a/gnu/usr.bin/perl/cpan/Test-Simple/lib/Test/Builder/Module.pm b/gnu/usr.bin/perl/cpan/Test-Simple/lib/Test/Builder/Module.pm
index 48e9ea8f748..2322d8a9b78 100644
--- a/gnu/usr.bin/perl/cpan/Test-Simple/lib/Test/Builder/Module.pm
+++ b/gnu/usr.bin/perl/cpan/Test-Simple/lib/Test/Builder/Module.pm
@@ -2,12 +2,12 @@ package Test::Builder::Module;
 
 use strict;
 
-use Test::Builder 0.99;
+use Test::Builder 1.00;
 
 require Exporter;
 our @ISA = qw(Exporter);
 
-our $VERSION = '1.001002';
+our $VERSION = '1.001014';
 $VERSION = eval $VERSION;      ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 
@@ -35,41 +35,41 @@ Test::Builder::Module - Base class for test modules
 
 =head1 DESCRIPTION
 
-This is a superclass for Test::Builder-based modules.  It provides a
+This is a superclass for L<Test::Builder>-based modules.  It provides a
 handful of common functionality and a method of getting at the underlying
-Test::Builder object.
+L<Test::Builder> object.
 
 
 =head2 Importing
 
-Test::Builder::Module is a subclass of Exporter which means your
+Test::Builder::Module is a subclass of L<Exporter> which means your
 module is also a subclass of Exporter.  @EXPORT, @EXPORT_OK, etc...
 all act normally.
 
-A few methods are provided to do the C<use Your::Module tests => 23> part
+A few methods are provided to do the C<< use Your::Module tests => 23 >> part
 for you.
 
 =head3 import
 
-Test::Builder::Module provides an import() method which acts in the
-same basic way as Test::More's, setting the plan and controlling
+Test::Builder::Module provides an C<import()> method which acts in the
+same basic way as L<Test::More>'s, setting the plan and controlling
 exporting of functions and variables.  This allows your module to set
-the plan independent of Test::More.
+the plan independent of L<Test::More>.
 
-All arguments passed to import() are passed onto 
+All arguments passed to C<import()> are passed onto 
 C<< Your::Module->builder->plan() >> with the exception of 
 C<< import =>[qw(things to import)] >>.
 
     use Your::Module import => [qw(this that)], tests => 23;
 
-says to import the functions this() and that() as well as set the plan
+says to import the functions C<this()> and C<that()> as well as set the plan
 to be 23 tests.
 
-import() also sets the exported_to() attribute of your builder to be
-the caller of the import() function.
+C<import()> also sets the C<exported_to()> attribute of your builder to be
+the caller of the C<import()> function.
 
-Additional behaviors can be added to your import() method by overriding
-import_extra().
+Additional behaviors can be added to your C<import()> method by overriding
+C<import_extra()>.
 
 =cut
 
@@ -123,13 +123,13 @@ sub _strip_imports {
 
     Your::Module->import_extra(\@import_args);
 
-import_extra() is called by import().  It provides an opportunity for you
+C<import_extra()> is called by C<import()>.  It provides an opportunity for you
 to add behaviors to your module based on its import list.
 
-Any extra arguments which shouldn't be passed on to plan() should be 
+Any extra arguments which shouldn't be passed on to C<plan()> should be
 stripped off by this method.
 
-See Test::More for an example of its use.
+See L<Test::More> for an example of its use.
 
 B<NOTE> This mechanism is I<VERY ALPHA AND LIKELY TO CHANGE> as it
 feels like a bit of an ugly hack in its current form.
@@ -147,15 +147,15 @@ Test::Builder object.
 
   my $builder = Your::Class->builder;
 
-This method returns the Test::Builder object associated with Your::Class.
+This method returns the L<Test::Builder> object associated with Your::Class.
 It is not a constructor so you can call it as often as you like.
 
-This is the preferred way to get the Test::Builder object.  You should
+This is the preferred way to get the L<Test::Builder> object.  You should
 I<not> get it via C<< Test::Builder->new >> as was previously
 recommended.
 
-The object returned by builder() may change at runtime so you should
-call builder() inside each function rather than store it in a global.
+The object returned by C<builder()> may change at runtime so you should
+call C<builder()> inside each function rather than store it in a global.
 
   sub ok {
       my $builder = Your::Class->builder;