Skip to content

Commit 37f2b5c

Browse files
authored
Merge pull request #1070 from metacpan/haarg/update-perltidy
Update Perl::Tidy and sync settings with metacpan-web
2 parents bb0a7e7 + e8b99b8 commit 37f2b5c

File tree

124 files changed

+1592
-1896
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+1592
-1896
lines changed

.perltidyrc

+16-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1-
-pbp
2-
-nst
3-
1+
--maximum-line-length=78
2+
--indent-columns=4
3+
--continuation-indentation=4
4+
--standard-error-output
5+
--vertical-tightness=2
6+
--closing-token-indentation=0
7+
--paren-tightness=1
8+
--brace-tightness=1
9+
--square-bracket-tightness=1
10+
--block-brace-tightness=1
11+
--nospace-for-semicolon
12+
--nooutdent-long-quotes
13+
--want-break-before="% + - * / x != == >= <= =~ !~ < > | & = **= += *= &= <<= &&= -= /= |= >>= ||= //= .= %= ^= x="
414
# Break a line after opening/before closing token.
5-
-vt=0
6-
-vtc=0
7-
8-
# Fix t/server/controller/login/pause.t tidyall failure
9-
# See https://github.com/autarch/Dist-Zilla-PluginBundle-DROLSKY/commit/b7f9c0194b83a72e4fe07ee5f9c541b6cfbf9b6d
10-
--character-encoding=none
15+
--vertical-tightness=0
16+
--vertical-tightness-closing=0
17+
--weld-nested-containers

app.psgi

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ BEGIN {
99
use lib "$root_dir/lib";
1010

1111
use Config::ZOMG;
12-
use File::Path ();
13-
use File::Spec ();
14-
use Log::Log4perl ();
15-
use Path::Tiny qw( path );
12+
use File::Path ();
13+
use File::Spec ();
14+
use Log::Log4perl ();
15+
use Path::Tiny qw( path );
1616
use Plack::App::Directory ();
1717
use Plack::App::URLMap ();
1818

cpanfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ requires 'Module::Extract::Namespaces', '1.023';
177177
requires 'Module::Faker', '0.015';
178178
requires 'Module::Faker::Dist', '0.010';
179179
requires 'Perl::Critic', '0.140';
180-
requires 'Perl::Tidy' => '20220217';
180+
requires 'Perl::Tidy' => '== 20220613';
181181
requires 'Plack::Test::Agent', '1.5';
182182
requires 'PPI', '1.274'; # Perl::Critic
183183
requires 'PPIx::QuoteLike', '0.022'; # Perl::Critic

cpanfile.snapshot

+32-28
Original file line numberDiff line numberDiff line change
@@ -5621,16 +5621,19 @@ DISTRIBUTIONS
56215621
Test::More 0.66
56225622
Test::Warn 0.21
56235623
URI::Escape 3.28
5624-
Net-SSLeay-1.82
5625-
pathname: M/MI/MIKEM/Net-SSLeay-1.82.tar.gz
5624+
Net-SSLeay-1.92
5625+
pathname: C/CH/CHRISN/Net-SSLeay-1.92.tar.gz
56265626
provides:
5627-
Net::SSLeay 1.82
5628-
Net::SSLeay::Handle 0.61
5627+
Net::SSLeay 1.92
5628+
Net::SSLeay::Handle 1.92
56295629
requirements:
5630-
ExtUtils::MakeMaker 6.36
5630+
English 0
5631+
ExtUtils::MakeMaker 0
5632+
File::Spec::Functions 0
56315633
MIME::Base64 0
5632-
Test::More 0.60_01
5633-
perl 5.005
5634+
Text::Wrap 0
5635+
constant 0
5636+
perl 5.008001
56345637
Net-Twitter-4.01043
56355638
pathname: M/MM/MMIMS/Net-Twitter-4.01043.tar.gz
56365639
provides:
@@ -6545,29 +6548,30 @@ DISTRIBUTIONS
65456548
strict 0
65466549
version 0.77
65476550
warnings 0
6548-
Perl-Tidy-20220217
6549-
pathname: S/SH/SHANCOCK/Perl-Tidy-20220217.tar.gz
6550-
provides:
6551-
Perl::Tidy 20220217
6552-
Perl::Tidy::Debugger 20220217
6553-
Perl::Tidy::DevNull 20220217
6554-
Perl::Tidy::Diagnostics 20220217
6555-
Perl::Tidy::FileWriter 20220217
6556-
Perl::Tidy::Formatter 20220217
6557-
Perl::Tidy::HtmlWriter 20220217
6558-
Perl::Tidy::IOScalar 20220217
6559-
Perl::Tidy::IOScalarArray 20220217
6560-
Perl::Tidy::IndentationItem 20220217
6561-
Perl::Tidy::LineBuffer 20220217
6562-
Perl::Tidy::LineSink 20220217
6563-
Perl::Tidy::LineSource 20220217
6564-
Perl::Tidy::Logger 20220217
6565-
Perl::Tidy::Tokenizer 20220217
6566-
Perl::Tidy::VerticalAligner 20220217
6567-
Perl::Tidy::VerticalAligner::Alignment 20220217
6568-
Perl::Tidy::VerticalAligner::Line 20220217
6551+
Perl-Tidy-20220613
6552+
pathname: S/SH/SHANCOCK/Perl-Tidy-20220613.tar.gz
6553+
provides:
6554+
Perl::Tidy 20220613
6555+
Perl::Tidy::Debugger 20220613
6556+
Perl::Tidy::DevNull 20220613
6557+
Perl::Tidy::Diagnostics 20220613
6558+
Perl::Tidy::FileWriter 20220613
6559+
Perl::Tidy::Formatter 20220613
6560+
Perl::Tidy::HtmlWriter 20220613
6561+
Perl::Tidy::IOScalar 20220613
6562+
Perl::Tidy::IOScalarArray 20220613
6563+
Perl::Tidy::IndentationItem 20220613
6564+
Perl::Tidy::LineBuffer 20220613
6565+
Perl::Tidy::LineSink 20220613
6566+
Perl::Tidy::LineSource 20220613
6567+
Perl::Tidy::Logger 20220613
6568+
Perl::Tidy::Tokenizer 20220613
6569+
Perl::Tidy::VerticalAligner 20220613
6570+
Perl::Tidy::VerticalAligner::Alignment 20220613
6571+
Perl::Tidy::VerticalAligner::Line 20220613
65696572
requirements:
65706573
ExtUtils::MakeMaker 0
6574+
perl 5.008
65716575
PerlIO-gzip-0.20
65726576
pathname: N/NW/NWCLARK/PerlIO-gzip-0.20.tar.gz
65736577
provides:

lib/Catalyst/Action/Deserialize/MetaCPANSanitizedJSON.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package Catalyst::Action::Deserialize::MetaCPANSanitizedJSON;
22

33
use Moose;
44
use namespace::autoclean;
5-
use Try::Tiny qw( catch try );
5+
use Try::Tiny qw( catch try );
66
use Cpanel::JSON::XS ();
77
use MetaCPAN::Server::QuerySanitizer ();
88

lib/Catalyst/Plugin/OAuth2/Provider.pm

+5-7
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ package Catalyst::Plugin::OAuth2::Provider::Controller;
1818
use Moose;
1919
BEGIN { extends 'Catalyst::Controller' }
2020

21-
use Digest::SHA ();
21+
use Digest::SHA ();
2222
use Cpanel::JSON::XS qw( decode_json encode_json );
23-
use URI ();
23+
use URI ();
2424

2525
has login => ( is => 'ro' );
2626
has clients => ( is => 'ro' );
@@ -107,11 +107,9 @@ sub access_token : Local {
107107
$user->put( { refresh => 1 } );
108108

109109
$c->res->content_type('application/json');
110-
$c->res->body(
111-
encode_json(
112-
{ access_token => $access_token, token_type => 'bearer' }
113-
)
114-
);
110+
$c->res->body( encode_json(
111+
{ access_token => $access_token, token_type => 'bearer' }
112+
) );
115113

116114
}
117115

lib/MetaCPAN/API.pm

+8-10
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ To run the api web server, run the following on one of the servers:
1919

2020
use Mojo::Base 'Mojolicious';
2121

22-
use Config::ZOMG ();
23-
use File::Temp ();
24-
use List::Util qw( any );
22+
use Config::ZOMG ();
23+
use File::Temp ();
24+
use List::Util qw( any );
2525
use MetaCPAN::Script::Runner ();
2626
use Search::Elasticsearch ();
27-
use Try::Tiny qw( catch try );
27+
use Try::Tiny qw( catch try );
2828

2929
has es => sub {
3030
return Search::Elasticsearch->new(
@@ -90,12 +90,10 @@ sub _gen_index_task_sub {
9090
}
9191
catch {
9292
warn $_;
93-
$job->fail(
94-
{
95-
message => $_,
96-
@warnings ? ( warnings => \@warnings ) : (),
97-
}
98-
);
93+
$job->fail( {
94+
message => $_,
95+
@warnings ? ( warnings => \@warnings ) : (),
96+
} );
9997
};
10098
}
10199
}

lib/MetaCPAN/Document/Author.pm

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use ElasticSearchX::Model::Document::Types qw(:all);
77
use ElasticSearchX::Model::Document;
88

99
# load order not important
10-
use Gravatar::URL ();
11-
use MetaCPAN::Types qw( Profile );
10+
use Gravatar::URL ();
11+
use MetaCPAN::Types qw( Profile );
1212
use MetaCPAN::Types::TypeTiny qw(
1313
ArrayRef
1414
ArrayRefPromote

lib/MetaCPAN/Document/Favorite/Set.pm

+5-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ has query_favorite => (
1111
isa => 'MetaCPAN::Query::Favorite',
1212
lazy => 1,
1313
builder => '_build_query_favorite',
14-
handles => [
15-
qw< agg_by_distributions
16-
by_user
17-
leaderboard
18-
recent
19-
users_by_distribution >
20-
],
14+
handles => [ qw< agg_by_distributions
15+
by_user
16+
leaderboard
17+
recent
18+
users_by_distribution > ],
2119
);
2220

2321
sub _build_query_favorite {

lib/MetaCPAN/Document/File.pm

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ use utf8;
77
use Moose;
88
use ElasticSearchX::Model::Document;
99

10-
use List::AllUtils qw( any );
10+
use List::AllUtils qw( any );
1111
use MetaCPAN::Document::Module ();
12-
use MetaCPAN::Types qw( Module );
13-
use MetaCPAN::Types::TypeTiny qw(
12+
use MetaCPAN::Types qw( Module );
13+
use MetaCPAN::Types::TypeTiny qw(
1414
ArrayRef
1515
Bool
1616
Int
@@ -21,9 +21,9 @@ use MetaCPAN::Types::TypeTiny qw(
2121
Str
2222
);
2323
use MetaCPAN::Util qw(numify_version);
24-
use Plack::MIME ();
25-
use Pod::Text ();
26-
use Try::Tiny qw( catch try );
24+
use Plack::MIME ();
25+
use Pod::Text ();
26+
use Try::Tiny qw( catch try );
2727

2828
Plack::MIME->add_type( '.t' => 'text/x-script.perl' );
2929
Plack::MIME->add_type( '.pod' => 'text/x-pod' );

0 commit comments

Comments
 (0)