Merge a031594 into cd550f5

Changes

@@ -3,6 +3,10 @@ for, noteworthy changes.
 
 {{$NEXT}}
 
+  [BUG FIXES]
+
+  - fixed empty exception messages under -d (new issue in 2.2007)
+
 2.2007   2017-11-12
 
   [DOCUMENTATION]

dist.ini

@@ -281,8 +281,8 @@ skip = ^Moose::Meta::TypeConstraint::Union$
 ;authordep Devel::GlobalDestruction    = 0
            Devel::OverloadInfo         = 0.004
 ;authordep Devel::OverloadInfo         = 0.004
-           Devel::StackTrace           = 1.33
-;authordep Devel::StackTrace           = 1.33
+           Devel::StackTrace           = 2.03
+;authordep Devel::StackTrace           = 2.03
            Eval::Closure               = 0.04
 ;authordep Eval::Closure               = 0.04
            List::Util                  = 1.45

lib/Moose/Exception.pm

@@ -2,7 +2,7 @@ package Moose::Exception;
 our $VERSION = '2.2008';
 
 use Moose;
-use Devel::StackTrace 1.33;
+use Devel::StackTrace 2.03;
 
 has 'trace' => (
     is            => 'ro',
@@ -36,7 +36,8 @@ sub _build_trace {
     # be weakening all references in its frames)
     my $skip = 0;
     while (my @c = caller(++$skip)) {
-        last if $c[3] =~ /^(.*)::new$/ && $self->isa($1);
+        last if ($c[3] =~ /^(.*)::new$/ || $c[3] =~ /^\S+ (.*)::new \(defined at /)
+            && $self->isa($1);
     }
     $skip++;
 
@@ -91,6 +92,7 @@ sub as_string {
     return $message;
 }
 
+__PACKAGE__->meta->make_immutable;
 1;
 
 # ABSTRACT: Superclass for Moose internal exceptions

t/exceptions/with-debugging.t

@@ -0,0 +1,37 @@
+use strict;
+use warnings;
+
+BEGIN {
+    # t/exceptions/without-debugging.t and t/exceptions/with-debugging.t are
+    # identical except for this one line.
+    $^P |= 0x200;
+}
+
+use Test::More tests => 2;
+use Test::Moose;
+use Moose::Exception;
+
+# with_immutable only toggles on, not off
+Moose::Exception->meta->make_mutable;
+
+sub foo
+{
+    return Moose::Exception->new(
+        message => 'something bad happened',
+    );
+}
+
+my $filename = __FILE__;
+
+with_immutable {
+    my $immutable = shift;
+
+    note "testing with immutable = $immutable, \$\^P is $^P";
+
+    like(
+        foo(),
+        qr{^something bad happened at $filename line \d+\n\tmain::foo at $filename line \d+},
+        "exception is well-formed (immutable = $immutable)",
+    );
+}
+'Moose::Exception';

t/exceptions/without-debugging.t

@@ -0,0 +1,37 @@
+use strict;
+use warnings;
+
+BEGIN {
+    # t/exceptions/without-debugging.t and t/exceptions/with-debugging.t are
+    # identical except for this one line.
+    $^P &= ~0x200;
+}
+
+use Test::More tests => 2;
+use Test::Moose;
+use Moose::Exception;
+
+# with_immutable only toggles on, not off
+Moose::Exception->meta->make_mutable;
+
+sub foo
+{
+    return Moose::Exception->new(
+        message => 'something bad happened',
+    );
+}
+
+my $filename = __FILE__;
+
+with_immutable {
+    my $immutable = shift;
+
+    note "testing with immutable = $immutable, \$\^P is $^P";
+
+    like(
+        foo(),
+        qr{^something bad happened at $filename line \d+\n\tmain::foo at $filename line \d+},
+        "exception is well-formed (immutable = $immutable)",
+    );
+}
+'Moose::Exception';