Fix some code for new APIs

[gitmo/Mouse.git] / lib / Mouse / Util / TypeConstraints.pm

diff --git a/lib/Mouse/Util/TypeConstraints.pm b/lib/Mouse/Util/TypeConstraints.pm
index 4ebb08a..5b3130a 100644 (file)
--- a/lib/Mouse/Util/TypeConstraints.pm
+++ b/lib/Mouse/Util/TypeConstraints.pm
@@ -8,11 +8,8 @@ use Carp qw(confess);
 use Scalar::Util qw/blessed looks_like_number openhandle/;
 
 use Mouse::Util qw(does_role not_supported);
-use Mouse::Meta::Module; # class_of
 use Mouse::Meta::TypeConstraint;
 
-use constant _DEBUG => !!$ENV{TC_DEBUG};
-
 our @ISA    = qw(Exporter);
 our @EXPORT = qw(
     as where message from via type subtype coerce class_type role_type enum
@@ -189,11 +186,12 @@ sub role_type {
     );
 }
 
-# this is an original method for Mouse
 sub typecast_constraints {
     my($class, $pkg, $type, $value) = @_;
     Carp::croak("wrong arguments count") unless @_ == 4;
 
+    Carp::cluck("typecast_constraints() has been deprecated, which was an internal utility anyway");
+
     return $type->coerce($value);
 }
 
@@ -222,7 +220,7 @@ sub _find_or_create_regular_type{
 
     return $TYPE{$spec} if exists $TYPE{$spec};
 
-    my $meta  = Mouse::Meta::Module::class_of($spec);
+    my $meta  = Mouse::Util::get_metaclass_by_name($spec);
 
     if(!$meta){
         return;
@@ -243,8 +241,6 @@ sub _find_or_create_regular_type{
         $type = 'Class';
     }
 
-    warn "#CREATE a $type type for $spec\n" if _DEBUG;
-
     return $TYPE{$spec} = Mouse::Meta::TypeConstraint->new(
         name      => $spec,
         optimized => $check,
@@ -292,8 +288,6 @@ sub _find_or_create_parameterized_type{
     my $name = sprintf '%s[%s]', $base->name, $param->name;
 
     $TYPE{$name} ||= do{
-        warn "#CREATE a Parameterized type for $name\n" if _DEBUG;
-
         my $generator = $base->{constraint_generator};
 
         if(!$generator){
@@ -315,8 +309,6 @@ sub _find_or_create_union_type{
     my $name = join '|', map{ $_->name } @types;
 
     $TYPE{$name} ||= do{
-        warn "# CREATE a Union type for ", Mouse::Util::english_list(@types),"\n" if _DEBUG;
-
         return Mouse::Meta::TypeConstraint->new(
             name              => $name,
             type_constraints  => \@types,