Merge pull request #2428 from metacpan/oalders/tidy-lib-imports

Tidy lib imports

Author: oalders

bin/generate_sitemap.pl

@@ -5,10 +5,11 @@
 use strict;
 use warnings;
 
-use File::Basename;
-use File::Spec;
-use Cwd;
-use Config::ZOMG;
+use File::Basename ();
+use File::Spec     ();
+use Cwd            ();
+use Config::ZOMG   ();
+
 my $root_dir;
 
 BEGIN {

lib/MetaCPAN/Middleware/Static.pm

@@ -1,10 +1,10 @@
 package MetaCPAN::Middleware::Static;
 use strict;
 use warnings;
-use Plack::Builder;
+use Plack::Builder qw( builder enable mount );
 use Plack::App::File;
 use JavaScript::Minifier::XS ();
-use Cwd qw(cwd);
+use Cwd qw( cwd );
 use Plack::MIME;
 
 Plack::MIME->add_type(

lib/MetaCPAN/Sitemap.pm

@@ -1,13 +1,13 @@
 package MetaCPAN::Sitemap;
 use strict;
 use warnings;
-use IO::Socket::SSL qw(SSL_VERIFY_PEER);
+use IO::Socket::SSL qw( SSL_VERIFY_PEER );
 use IO::Async::Loop;
 use IO::Async::SSL;
 use Net::Async::HTTP;
-use Cpanel::JSON::XS;
-use IO::Compress::Gzip;
-use HTML::Entities qw(encode_entities_numeric);
+use Cpanel::JSON::XS   ();
+use IO::Compress::Gzip ();
+use HTML::Entities qw( encode_entities_numeric );
 use Future;
 
 use Moo;

lib/MetaCPAN/Web.pm

@@ -48,7 +48,7 @@ __PACKAGE__->log( Log::Log4perl::Catalyst->new( undef, autoflush => 1 ) );
 # Squash warnings when not in a terminal (like when running under Docker)
 # Catalyst throws warnings if it can't detect the size, even if $ENV{COLUMNS}
 # exists. Just lie to it to shut it up.
-use Term::Size::Perl;
+use Term::Size::Perl ();
 if ( !Term::Size::Perl::chars() ) {
     no warnings 'once', 'redefine';
     *Term::Size::Perl::chars = sub { $ENV{COLUMNS} || 80 };

lib/MetaCPAN/Web/Controller/Feed.pm

@@ -6,11 +6,11 @@ use namespace::autoclean;
 BEGIN { extends 'MetaCPAN::Web::Controller' }
 
 use DateTime::Format::ISO8601 ();
-use HTML::Escape qw/escape_html/;
-use MetaCPAN::Web::Types qw( ArrayRef HashRef Str Uri Enum Undef );
+use HTML::Escape qw( escape_html );
+use MetaCPAN::Web::Types qw( ArrayRef Enum HashRef Str Undef Uri );
 use Params::ValidationCompiler qw( validation_for );
-use Path::Tiny qw/path/;
-use Text::MultiMarkdown qw/markdown/;
+use Path::Tiny qw( path );
+use Text::MultiMarkdown qw( markdown );
 use XML::FeedPP ();
 
 sub feed_index : PathPart('feed') : Chained('/') : CaptureArgs(0) {

lib/MetaCPAN/Web/Controller/News.pm

@@ -4,7 +4,7 @@ use Moose;
 
 BEGIN { extends 'MetaCPAN::Web::Controller' }
 
-use Path::Tiny qw/path/;
+use Path::Tiny qw( path );
 
 sub news : Path : Args(0) {
     my ( $self, $c ) = @_;

lib/MetaCPAN/Web/Controller/Permission.pm

@@ -1,7 +1,7 @@
 package MetaCPAN::Web::Controller::Permission;
 
 use Moose;
-use List::Util qw(uniq);
+use List::Util qw( uniq );
 use namespace::autoclean;
 
 BEGIN { extends 'MetaCPAN::Web::Controller' }

lib/MetaCPAN/Web/Controller/Pod.pm

@@ -3,7 +3,7 @@ package MetaCPAN::Web::Controller::Pod;
 use Moose;
 
 use Future;
-use MetaCPAN::Web::RenderUtil 'filter_html';
+use MetaCPAN::Web::RenderUtil qw( filter_html );
 use Try::Tiny qw( try );
 
 use namespace::autoclean;

lib/MetaCPAN/Web/Controller/Pod2HTML.pm

@@ -2,9 +2,9 @@ package MetaCPAN::Web::Controller::Pod2HTML;
 
 use Moose;
 
-use Encode qw( encode decode DIE_ON_ERR LEAVE_SRC );
+use Encode qw( decode DIE_ON_ERR encode LEAVE_SRC );
 use HTML::TokeParser ();
-use MetaCPAN::Web::RenderUtil 'filter_html';
+use MetaCPAN::Web::RenderUtil qw( filter_html );
 use Future;
 
 use namespace::autoclean;

lib/MetaCPAN/Web/Controller/Search/AutoComplete.pm

@@ -1,7 +1,7 @@
 package MetaCPAN::Web::Controller::Search::AutoComplete;
 
 use Moose;
-use List::Util qw(uniq);
+use List::Util qw( uniq );
 
 use namespace::autoclean;
 

lib/MetaCPAN/Web/Model/API.pm

@@ -9,16 +9,16 @@ use Encode ();
 use Cpanel::JSON::XS qw( decode_json encode_json );
 use IO::Async::Loop;
 use IO::Async::SSL;
-use IO::Socket::SSL qw(SSL_VERIFY_PEER);
+use IO::Socket::SSL qw( SSL_VERIFY_PEER );
 use Net::Async::HTTP;
-use URI;
+use URI ();
 use URI::QueryParam;
 use MetaCPAN::Web::Types qw( Uri );
 use Try::Tiny qw( catch try );
 use HTTP::Request;
 use HTTP::Request::Common ();
-use URI::Escape qw(uri_escape);
-use Ref::Util qw(is_arrayref);
+use URI::Escape qw( uri_escape );
+use Ref::Util qw( is_arrayref );
 
 my $loop;
 

lib/MetaCPAN/Web/Model/API/Author.pm

@@ -5,7 +5,7 @@ use namespace::autoclean;
 
 use Future ();
 use Ref::Util qw( is_arrayref );
-use URI::Escape qw(uri_escape);
+use URI::Escape qw( uri_escape );
 
 extends 'MetaCPAN::Web::Model::API';
 

lib/MetaCPAN/Web/Model/API/Changes.pm

@@ -2,9 +2,8 @@ package MetaCPAN::Web::Model::API::Changes;
 use Moose;
 extends 'MetaCPAN::Web::Model::API';
 
-use MetaCPAN::Web::Model::API::Changes::Parser;
-use Try::Tiny;
-use Ref::Util qw(is_arrayref);
+use MetaCPAN::Web::Model::API::Changes::Parser ();
+use Ref::Util qw( is_arrayref );
 use Future ();
 
 sub get {

lib/MetaCPAN/Web/Model/API/Diff.pm

@@ -1,7 +1,7 @@
 package MetaCPAN::Web::Model::API::Diff;
 use Moose;
 use namespace::autoclean;
-use Digest::SHA;
+use Digest::SHA ();
 
 extends 'MetaCPAN::Web::Model::API';
 

lib/MetaCPAN/Web/Model/API/Favorite.pm

@@ -4,7 +4,6 @@ use namespace::autoclean;
 
 extends 'MetaCPAN::Web::Model::API';
 
-use List::Util qw(uniq);
 use Future;
 
 sub by_dist {

lib/MetaCPAN/Web/Model/API/Permission.pm

@@ -2,7 +2,7 @@ package MetaCPAN::Web::Model::API::Permission;
 
 use Moose;
 use Future;
-use List::Util qw(uniq);
+use List::Util qw( uniq );
 
 extends 'MetaCPAN::Web::Model::API';
 

lib/MetaCPAN/Web/Model/ReleaseInfo.pm

@@ -7,9 +7,9 @@ use MetaCPAN::Moose;
 extends 'Catalyst::Model';
 
 use List::Util qw( all max );
-use Ref::Util qw( is_hashref is_arrayref );
+use Ref::Util qw( is_hashref );
 use URI ();
-use URI::Escape qw(uri_escape uri_unescape);
+use URI::Escape qw( uri_escape uri_unescape );
 use URI::QueryParam;    # Add methods to URI.
 use Future;
 

lib/MetaCPAN/Web/RenderUtil.pm

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Sub::Exporter -setup => { exports => [qw(filter_html)], };
 
-use HTML::Escape qw(escape_html);
+use HTML::Escape qw( escape_html );
 use HTML::Restrict ();
 use URI            ();
 

lib/MetaCPAN/Web/Role/Date.pm

@@ -1,7 +1,7 @@
 package MetaCPAN::Web::Role::Date;
 use strict;
 use warnings;
-use Role::Tiny;
+use Role::Tiny qw( requires );
 
 requires 'strftime';
 

lib/MetaCPAN/Web/Role/Request.pm

@@ -4,7 +4,7 @@ use Moose::Role;
 use Plack::Session;
 use Cpanel::JSON::XS ();
 use MetaCPAN::Web::Types qw( is_PositiveInt );
-use Try::Tiny;
+use Try::Tiny qw( catch try );
 
 use namespace::autoclean;
 

lib/MetaCPAN/Web/Role/RiverData.pm

@@ -1,7 +1,7 @@
 package MetaCPAN::Web::Role::RiverData;
 use Moose::Role;
 use Future;
-use List::Util qw(uniq);
+use List::Util qw( uniq );
 use namespace::autoclean;
 
 sub add_river {

lib/MetaCPAN/Web/Test.pm

@@ -5,14 +5,14 @@ package MetaCPAN::Web::Test;
 use strict;
 use warnings;
 
-use Plack::Test;
-use HTTP::Request::Common;
-use HTTP::Message::PSGI;
+use Plack::Test qw( test_psgi );
+use HTTP::Request::Common qw( GET POST );
+use HTTP::Message::PSGI ();
 use HTML::Tree;
-use Test::More;
+use Test::More import => [qw( is )];
 use Test::XPath;
-use Try::Tiny;
-use Encode;
+use Try::Tiny qw( catch try );
+use Encode qw( decode_utf8 );
 use Future;
 use MetaCPAN::Web::Test::HTML5::TreeBuilder;
 use base 'Exporter';

lib/MetaCPAN/Web/Types.pm

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use Type::Library -base;
-use Type::Utils -all;
+use Type::Utils qw( extends );
 
 BEGIN {
     extends qw(

lib/MetaCPAN/Web/View/HTML.pm

@@ -6,16 +6,16 @@ extends 'Catalyst::View::TT::Alloy';
 use version;
 use DateTime;
 use DateTime::Format::ISO8601;
-use Digest::SHA;
+use Digest::SHA      ();
 use List::Util       ();
 use Cpanel::JSON::XS ();
-use Gravatar::URL;
-use MetaCPAN::Web::RenderUtil 'filter_html';
+use Gravatar::URL    ();
+use MetaCPAN::Web::RenderUtil qw( filter_html );
 use Regexp::Common qw(time);
-use Number::Format;
-use Text::MultiMarkdown;
-use Text::Pluralize ();
-use URI;
+use Number::Format      ();
+use Text::MultiMarkdown ();
+use Text::Pluralize     ();
+use URI                 ();
 use URI::QueryParam;
 use With::Roles;
 

lib/Plack/Middleware/Assets/Dev.pm

@@ -1,5 +1,5 @@
 package Plack::Middleware::Assets::Dev;
-use Digest::SHA qw(sha1_hex);
+use Digest::SHA qw( sha1_hex );
 use Moo;
 
 with 'Plack::Middleware::Assets::Core';

lib/Plack/Middleware/Assets/FileCached.pm

@@ -1,6 +1,6 @@
 package Plack::Middleware::Assets::FileCached;
 use File::Temp ();
-use Digest::SHA qw(sha1_hex);
+use Digest::SHA qw( sha1_hex );
 use File::Path ();
 use Moo;
 

lib/Plack/Middleware/Session/Cookie/MetaCPAN.pm

@@ -3,9 +3,9 @@ use strict;
 use parent qw(Plack::Middleware::Session::Cookie);
 
 use Plack::Util;
-use MIME::Base64;
+use MIME::Base64     ();
 use Cpanel::JSON::XS ();
-use Try::Tiny;
+use Try::Tiny qw( catch try );
 
 my $json = Cpanel::JSON::XS->new->canonical(1);