From: Jesse Luehrs <doy@tozt.net>
Date: Sat, 24 Jul 2010 04:33:02 +0000 (-0500)
Subject: fix a test and clarify some docs
X-Git-Tag: 1.09~45
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=dede9732d4e69873c0567db9c0a39caa7d505437;p=gitmo%2FMoose.git

fix a test and clarify some docs
---

diff --git a/lib/Moose/Manual/Delta.pod b/lib/Moose/Manual/Delta.pod
index 1f7432f..5786f6a 100644
--- a/lib/Moose/Manual/Delta.pod
+++ b/lib/Moose/Manual/Delta.pod
@@ -43,10 +43,14 @@ for changing using C<legal_options_for_inheritance> method. This
 method has been removed. New method C<illegal_options_for_inheritance>
 can now be used to prevent certain options from being changeable.
 
-  package Bar::Meta::Attribute;
-  use Moose;
+This also now only throws an error if the illegal option was actually
+changed. If the superclass version of an attribute didn't specify this
+option at all, the subclass version can still add it as an option.
+
+Example of overriding this in an attribute trait:
 
-  extends 'Moose::Meta::Attribute';
+  package Bar::Meta::Attribute;
+  use Moose::Role;
 
   has 'my_illegal_option' => (
     isa => 'CodeRef',
diff --git a/t/020_attributes/009_attribute_inherited_slot_specs.t b/t/020_attributes/009_attribute_inherited_slot_specs.t
index 1a61073..71bc254 100644
--- a/t/020_attributes/009_attribute_inherited_slot_specs.t
+++ b/t/020_attributes/009_attribute_inherited_slot_specs.t
@@ -51,7 +51,7 @@ use Test::Exception;
 
     # this one will work here ....
     has 'fail' => (isa => 'CodeRef', is => 'bare');
-    has 'other_fail' => (metaclass => 'Thing::Meta::Attribute', is => 'bare');
+    has 'other_fail' => (metaclass => 'Thing::Meta::Attribute', is => 'bare', trigger => sub { });
 
     package Bar;
     use Moose;