Skip to content

Commit 054c702

Browse files
committed
---
yaml --- r: 136189 b: refs/heads/try c: 39de846 h: refs/heads/master i: 136187: 51e336b v: v3
1 parent 39ae546 commit 054c702

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: b5ba2f5517b1f90d07969ca3facdf5132e42436c
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 749ff5e76a0d08837964e44c66654679a3a88bb8
5-
refs/heads/try: 8a91d33ee7267c71a0ae286739dbd72433470004
5+
refs/heads/try: 39de8464ed16e00c716faff2782fef6babbb090b
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustdoc/clean/mod.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,6 @@ pub enum Type {
10871087
/// aka TyBot
10881088
Bottom,
10891089
Unique(Box<Type>),
1090-
Managed(Box<Type>),
10911090
RawPointer(Mutability, Box<Type>),
10921091
BorrowedRef {
10931092
pub lifetime: Option<Lifetime>,
@@ -1253,12 +1252,6 @@ impl Clean<Type> for ty::t {
12531252
ty::ty_float(ast::TyF32) => Primitive(F32),
12541253
ty::ty_float(ast::TyF64) => Primitive(F64),
12551254
ty::ty_str => Primitive(Str),
1256-
ty::ty_box(t) => {
1257-
let gc_did = cx.tcx_opt().and_then(|tcx| {
1258-
tcx.lang_items.gc()
1259-
});
1260-
lang_struct(cx, gc_did, t, "Gc", Managed)
1261-
}
12621255
ty::ty_uniq(t) => {
12631256
let box_did = cx.tcx_opt().and_then(|tcx| {
12641257
tcx.lang_items.owned_box()

branches/try/src/librustdoc/html/format.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ impl fmt::Show for clean::Type {
476476
};
477477
write!(f, "&amp;{}{}{}", lt, MutableSpace(mutability), **ty)
478478
}
479-
clean::Unique(..) | clean::Managed(..) => {
479+
clean::Unique(..) => {
480480
fail!("should have been cleaned")
481481
}
482482
}

0 commit comments

Comments
 (0)