X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=moose-class%2Fslides%2Findex.html;h=b3f57f681376337f550f7a3624631f0a305fcc1c;hb=7f7e655a677ae4e66c2bf208a9898c796a12e779;hp=a21e61b5b5c94858d032c1ba74cf51758a59f768;hpb=f865e3aea930e190c8908d8f599263766a7330f9;p=gitmo%2Fmoose-presentations.git

diff --git a/moose-class/slides/index.html b/moose-class/slides/index.html
index a21e61b..b3f57f6 100644
--- a/moose-class/slides/index.html
+++ b/moose-class/slides/index.html
@@ -950,10 +950,10 @@ sub BUILD {
 <div class="slide">
   <h1>Object Construction a la Moose</h1>
 
-  <pre><code>Person-&gt;new(@_)</code></pre>
+  <pre><code>Person-&gt;new(@args)</code></pre>
 
   <ol style="margin-top: 0">
-    <li>Calls <code>Person-&gt;BUILDARGS(@_)</code> to turn <code>@_</code> into a hashref</li>
+    <li>Calls <code>Person-&gt;BUILDARGS(@args)</code> to turn <code>@args</code> into a hashref</li>
     <li>Blesses a reference</li>
     <li>Populates attributes based on the hashref from #1</li>
     <li>Calls <code>$new_object-&gt;BUILDALL($constructor_args)</code>
@@ -1032,7 +1032,7 @@ extends 'LWP';</code></pre>
         <li>No <code>DEMOLISH()</code></li>
       </ul>
     </li>
-    <li>But see <code>MooseX::NonMoose</code> for a workaround</li>
+    <li>But <code>MooseX::NonMoose</code> fixes all of this</li>
   </ul>
 </div>  
 
@@ -1155,8 +1155,8 @@ Person-&gt;can('extends');</code></pre>
   <h1>Cleaning Up Moose Droppings</h1>
 
   <pre><code>package Person;
-<span class="highlight">use namespace::autoclean;</span>
 use Moose;
+<span class="highlight">use namespace::autoclean;</span>
 
 ...
 
@@ -1487,34 +1487,6 @@ Integer-&gt;does('Comparable'); # also true!</code></pre>
 </div>
 
 <div class="slide">
-  <h1>Name Conflicts Between Roles</h1>
-
-  <pre><code>package HasSubProcess;
-use Moose::Role;
-
-<span class="highlight">sub execute { ... }</span>
-
-package Killer;
-use Moose::Role;
-
-with 'HasSubProcess';
-
-<span class="highlight">sub execute { ... }</span></code></pre>
-</div>
-
-<div class="slide">
-  <h1>Delayed Conflict</h1>
-
-  <pre><code>package SysadminAssassin;
-with 'Killer';</code></pre>
-
-  <ul>
-    <li><code>SysadminAssassin</code> must implement its own <code>execute</code></li>
-    <li>But loading the <code>Killer</code> role by itself does not cause an error</li>
-  </ul>
-</div>
-
-<div class="slide">
   <h1>Roles as Interfaces</h1>
 
   <ul>
@@ -2422,9 +2394,9 @@ around run</span> =&gt; sub {
         <li>alter parameters passed to the original method</li>
         <li>alter the return value of the original method</li>
         <li>not call the original method at all (or call a <em>different</em> method)</li>
-        <li>When using modifiers in a role, require the modified method</li>
       </ul>
     </li>
+    <li>When using modifiers in a role, require the modified method</li>
   </ul>
 </div>
 
@@ -2852,7 +2824,7 @@ sub work {
   <h1>Digression: The Type Registry</h1>
 
   <ul>
-    <li>Types are actually <code>Moose::Meta::TypeConstraints</code> <em>objects</em></li>
+    <li>Types are actually <code>Moose::Meta::TypeConstraint</code> <em>objects</em></li>
     <li>Stored in an interpreter-global registry mapping names to objects</li>
   </ul>
 </div>
@@ -3705,7 +3677,7 @@ with HasCollection =&gt; { type =&gt; 'Int' };</code></pre>
     <li>mailing list - <a href="mailto:moose@perl.org">moose@perl.org</a></li>
     <li>Slides and exercises are in Moose's git repo:
         <br />
-        <span style="font-size:80%; white-space: nowrap">git://jules.scsys.co.uk/gitmo/moose-presentations</span></li>
+        <span style="font-size:80%; white-space: nowrap">git://git.moose.perl.org/moose-presentations.git</span></li>
   </ul>
 </div>