Bump Moo dep and remove warning defatalisation hack

Moo 2 no longer pulls in strictures

diff --git a/Makefile.PL b/Makefile.PL
index 03997b5..87a0f64 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -20,7 +20,7 @@ requires 'List::Util'     => '0';
 requires 'Scalar::Util'   => '0';
 requires 'Exporter'       => '5.57';
 requires 'MRO::Compat'    => '0.12';
-requires 'Moo'            => '1.004002';
+requires 'Moo'            => '2.000001';
 requires 'Hash::Merge'    => '0.12';
 requires 'Text::Balanced' => '2.00';
 

diff --git a/lib/SQL/Abstract/Tree.pm b/lib/SQL/Abstract/Tree.pm
index ecf950d..75cf859 100644 (file)
--- a/lib/SQL/Abstract/Tree.pm
+++ b/lib/SQL/Abstract/Tree.pm
@@ -1,32 +1,10 @@
 package SQL::Abstract::Tree;
 
-# DO NOT edit away without talking to riba first, he will just put it back
-# BEGIN pre-Moo2 import block
-BEGIN {
-  require warnings;
-  my $initial_fatal_bits = (${^WARNING_BITS}||'') & $warnings::DeadBits{all};
-
-  local $ENV{PERL_STRICTURES_EXTRA} = 0;
-  # load all of these now, so that lazy-loading does not escape
-  # the current PERL_STRICTURES_EXTRA setting
-  require Sub::Quote;
-  require Sub::Defer;
-  require Moo;
-  require Moo::Object;
-  require Method::Generate::Accessor;
-  require Method::Generate::Constructor;
-
-  Moo->import;
-  Sub::Quote->import('quote_sub');
-  ${^WARNING_BITS} &= ( $initial_fatal_bits | ~ $warnings::DeadBits{all} );
-}
-# END pre-Moo2 import block
-
-use strict;
-use warnings;
+use Moo;
 no warnings 'qw';
 
 use Carp;
+use Sub::Quote 'quote_sub';
 
 my $op_look_ahead = '(?: (?= [\s\)\(\;] ) | \z)';
 my $op_look_behind = '(?: (?<= [\,\s\)\(] ) | \A )';