Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "Merge branch 'exodist/master' into HEAD"

This reverts commit 6a51af0, reversing
changes made to b572034.

This change doubled load time.  It will instead be moved into the issue/217 branch to
clear the way for release and so it can continue to be worked on.

For #217
  • Loading branch information...
commit e936a45a88e1b3d466cbde2548915c758ce53cdf 1 parent a8d93fb
@schwern schwern authored
View
1  Build.PL
@@ -50,7 +50,6 @@ my $builder = MyBuild->new(
'true::VERSION' => '0.16',
'Capture::Tiny' => '0.06',
'utf8::all' => '0.002',
- 'circular::require' => '0.09',
},
build_requires => {
'ExtUtils::CBuilder' => '0.26',
View
9 lib/perl5i/2.pm
@@ -7,9 +7,6 @@ use strict;
use warnings;
#This should come first
-use circular::require;
-
-# A few of the following modules have cycles, so turn off detection for now.
use perl5i::2::RequireMessage;
use IO::Handle;
@@ -34,9 +31,6 @@ use parent 'autovivification';
use parent 'indirect';
use parent 'utf8::all';
-# Enable cycle detection.
-no circular::require;
-
## no critic (Subroutines::RequireArgUnpacking)
sub import {
my $class = shift;
@@ -98,9 +92,6 @@ sub import {
# Current lexically active major version of perl5i.
$^H{perl5i} = 2;
- # enable cycle detection
- circular::require->unimport();
-
# autodie needs a bit more convincing
@_ = ( $class, ":all" );
goto &autodie::import;
View
4 lib/perl5i/2/DateTime.pm
@@ -6,9 +6,6 @@ use 5.010;
use strict;
use warnings;
-use circular::require;
-use DateTime;
-
# Determine if we need Time::y2038 and only load if necessary.
# XXX This is a bit of a hack and should go into a config file.
use constant NEEDS_y2038 => (
@@ -32,6 +29,7 @@ sub dt_gmtime (;$) {
$mon++;
$year += 1900;
+ require DateTime;
return perl5i::2::DateTime::y2038->new(
year => $year,
month => $mon,
View
9 lib/perl5i/2/RequireMessage.pm
@@ -6,13 +6,8 @@ use warnings;
my $diesub = sub {
my ( $sub, $mod ) = @_;
- my @caller;
- my $count = 0;
- @caller = caller($count++)
- while !$caller[0] || $caller[0] eq 'circular::require';
-
- return unless $caller[10]->{perl5i};
-
+ my $hints = (caller(0))[10];
+ return unless $hints->{perl5i};
die( <<EOT );
Can't locate $mod in your Perl library. You may need to install it
from CPAN or another repository. Your library paths are:
Please sign in to comment.
Something went wrong with that request. Please try again.