---

yaml
---
r: 130233
b: refs/heads/master
c: 395e453
h: refs/heads/master
i:
  130231: aa8de38
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d8a26184dc103025e7ad457ffd8deb391019dbfe
+refs/heads/master: 395e453c06cce045d2e0613a1c6edab2dcfdeceb
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 67b97ab6d2b7de9b69fd97dc171fcf8feec932ff
 refs/heads/try: 28d5878c1f0465c11c8e7a3085008b0c592d48d0

trunk/src/librustc/middle/trans/glue.rs

@@ -111,17 +111,14 @@ pub fn get_drop_glue_type(ccx: &CrateContext, t: ty::t) -> ty::t {
         return ty::mk_i8();
     }
     match ty::get(t).sty {
-        ty::ty_box(typ) if !ty::type_needs_drop(tcx, typ) =>
-            ty::mk_box(tcx, ty::mk_i8()),
-
         ty::ty_uniq(typ) if !ty::type_needs_drop(tcx, typ)
                          && ty::type_is_sized(tcx, typ) => {
             let llty = sizing_type_of(ccx, typ);
             // `Box<ZeroSizeType>` does not allocate.
             if llsize_of_alloc(ccx, llty) == 0 {
                 ty::mk_i8()
             } else {
-                ty::mk_uniq(tcx, ty::mk_i8())
+                t
             }
         }
         _ => t

trunk/src/librustdoc/html/static/main.css

@@ -177,8 +177,6 @@ nav.sub {
     color: #333;
 }
 
-.location a:first-child { font-weight: bold; }
-
 .block {
     padding: 0 10px;
     margin-bottom: 14px;