xslate · skaji · Nov 26, 2017 · Nov 26, 2017
diff --git a/author/import-moose-test.pl b/author/import-moose-test.pl
@@ -79,7 +79,8 @@ sub copy_as_mouse {
         if($. == 2) {
             say $out "# This is automatically generated by $0.";
             say $out "# DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!";
-            say $out 'use t::lib::MooseCompat;';
+            say $out 'use lib "t/lib";';
+            say $out 'use MooseCompat;';
         }
         s/ Class::MOP::([a-z_]+) /Mouse::Util::$1/xmsg;
         s/ Class::MOP            /Mouse::Meta/xmsg;

diff --git a/t/001_mouse/805-class_type.t b/t/001_mouse/805-class_type.t
@@ -6,19 +6,20 @@ use Test::More tests => 4;
     use Mouse;
     use Mouse::Util::TypeConstraints;
 
-    require t::lib::ClassType_Foo;
+    use lib "t/lib";
+    require ClassType_Foo;
 
     # XXX: This below API is different from that of Moose.
     # class_type() should be class_type 'ClassName';
     #    class_type 'Headers' => { class => 't::lib::ClassType_Foo' };
     # this should be subtype Headers => as 't::lib::ClassType_foo';
     subtype 'Headers'
-        => as 't::lib::ClassType_Foo'
+        => as 'ClassType_Foo'
     ;
 
     coerce 'Headers' =>
         from 'HashRef' => via {
-            t::lib::ClassType_Foo->new(%{ $_ });
+            ClassType_Foo->new(%{ $_ });
         },
     ;
 
@@ -30,8 +31,8 @@ use Test::More tests => 4;
 }
 
 my $res = Response->new(headers => { foo => 'bar' });
-isa_ok($res->headers, 't::lib::ClassType_Foo');
+isa_ok($res->headers, 'ClassType_Foo');
 is($res->headers->foo, 'bar');
 $res->headers({foo => 'yay'});
-isa_ok($res->headers, 't::lib::ClassType_Foo');
+isa_ok($res->headers, 'ClassType_Foo');
 is($res->headers->foo, 'yay');
diff --git a/t/020_attributes/002_attribute_writer_generation.t b/t/020_attributes/002_attribute_writer_generation.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/003_attribute_accessor_generation.t b/t/020_attributes/003_attribute_accessor_generation.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/005_attribute_does.t b/t/020_attributes/005_attribute_does.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/006_attribute_required.t b/t/020_attributes/006_attribute_required.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/007_attribute_custom_metaclass.t b/t/020_attributes/007_attribute_custom_metaclass.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/008_attribute_type_unions.t b/t/020_attributes/008_attribute_type_unions.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/009_attribute_inherited_slot_specs.t b/t/020_attributes/009_attribute_inherited_slot_specs.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/011_more_attr_delegation.t b/t/020_attributes/011_more_attr_delegation.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/013_attr_dereference_test.t b/t/020_attributes/013_attr_dereference_test.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/014_misc_attribute_coerce_lazy.t b/t/020_attributes/014_misc_attribute_coerce_lazy.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/015_attribute_traits.t b/t/020_attributes/015_attribute_traits.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/017_attribute_traits_n_meta.t b/t/020_attributes/017_attribute_traits_n_meta.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/018_no_init_arg.t b/t/020_attributes/018_no_init_arg.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/020_trigger_and_coerce.t b/t/020_attributes/020_trigger_and_coerce.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/022_illegal_options_for_inheritance.t b/t/020_attributes/022_illegal_options_for_inheritance.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/024_attribute_traits_parameterized.t b/t/020_attributes/024_attribute_traits_parameterized.t
@@ -1,7 +1,8 @@
 #!/usr/bin/env perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 use strict;
 use warnings;
 use Test::More;

diff --git a/t/020_attributes/025_chained_coercion.t b/t/020_attributes/025_chained_coercion.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/026_attribute_without_any_methods.t b/t/020_attributes/026_attribute_without_any_methods.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/027_accessor_override_method.t b/t/020_attributes/027_accessor_override_method.t
@@ -1,7 +1,8 @@
 #!/usr/bin/env perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 use strict;
 use warnings;
 use Test::More;

diff --git a/t/020_attributes/029_accessor_context.t b/t/020_attributes/029_accessor_context.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/030_non_alpha_attr_names.t b/t/020_attributes/030_non_alpha_attr_names.t
@@ -1,7 +1,8 @@
 use strict;
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 use warnings;
 
 use Test::More;

diff --git a/t/020_attributes/031_delegation_and_modifiers.t b/t/020_attributes/031_delegation_and_modifiers.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/020_attributes/032_delegation_arg_aliasing.t b/t/020_attributes/032_delegation_arg_aliasing.t
@@ -1,7 +1,8 @@
 #!/usr/bin/env perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 use strict;
 use warnings;
 use Test::More;

diff --git a/t/020_attributes/034_numeric_defaults.t b/t/020_attributes/034_numeric_defaults.t
@@ -1,7 +1,8 @@
 #!/usr/bin/env perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 use strict;
 use warnings;
 use Test::More;

diff --git a/t/020_attributes/035_default_undef.t b/t/020_attributes/035_default_undef.t
@@ -1,7 +1,8 @@
 #!/usr/bin/env perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 use strict;
 use warnings;
 use Test::More;

diff --git a/t/030_roles/020_role_composite.t b/t/030_roles/020_role_composite.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/040_type_constraints/002_util_type_constraints_export.t b/t/040_type_constraints/002_util_type_constraints_export.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/040_type_constraints/003_util_std_type_constraints.t b/t/040_type_constraints/003_util_std_type_constraints.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/040_type_constraints/004_util_find_type_constraint.t b/t/040_type_constraints/004_util_find_type_constraint.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/040_type_constraints/006_util_type_reloading.t b/t/040_type_constraints/006_util_type_reloading.t
@@ -1,13 +1,12 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;
 
-use lib 't/lib', 'lib';
-
 use Test::More;
 use Test::Exception;
 

diff --git a/t/040_type_constraints/007_util_more_type_coercion.t b/t/040_type_constraints/007_util_more_type_coercion.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/040_type_constraints/009_union_types_and_coercions.t b/t/040_type_constraints/009_union_types_and_coercions.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/040_type_constraints/011_container_type_constraint.t b/t/040_type_constraints/011_container_type_constraint.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;

diff --git a/t/040_type_constraints/016_subtyping_parameterized_types.t b/t/040_type_constraints/016_subtyping_parameterized_types.t
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # This is automatically generated by author/import-moose-test.pl.
 # DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!
-use t::lib::MooseCompat;
+use lib "t/lib";
+use MooseCompat;
 
 use strict;
 use warnings;