---

yaml
---
r: 32430
b: refs/heads/dist-snap
c: c5e2cf2
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: ee4ba4490d1f49c8aef12a5194a4e9b50dfc87fa
+refs/heads/dist-snap: c5e2cf2ee5b47a526b2eeebf26312fb184fcf7a6
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/typeck/check.rs

@@ -749,7 +749,8 @@ fn do_autoderef(fcx: @fn_ctxt, sp: span, t: ty::t) -> ty::t {
 
         // Some extra checks to detect weird cycles and so forth:
         match sty {
-            ty::ty_box(inner) | ty::ty_uniq(inner) | ty::ty_rptr(_, inner) => {
+            ty::ty_box(inner) | ty::ty_uniq(inner) |
+            ty::ty_rptr(_, inner) => {
                 match ty::get(t1).struct {
                     ty::ty_infer(ty::TyVar(v1)) => {
                         ty::occurs_check(fcx.ccx.tcx, sp, v1,
@@ -759,11 +760,12 @@ fn do_autoderef(fcx: @fn_ctxt, sp: span, t: ty::t) -> ty::t {
                 }
             }
             ty::ty_enum(did, _) => {
-                // Watch out for a type like `enum t = @t`.  Such a type would
-                // otherwise infinitely auto-deref.  This is the only autoderef
-                // loop that needs to be concerned with this, as an error will be
-                // reported on the enum definition as well because the enum is not
-                // instantiable.
+                // Watch out for a type like `enum t = @t`.  Such a
+                // type would otherwise infinitely auto-deref.  This
+                // is the only autoderef loop that needs to be
+                // concerned with this, as an error will be reported
+                // on the enum definition as well because the enum is
+                // not instantiable.
                 if vec::contains(enum_dids, did) {
                     return t1;
                 }