Skip to content

Commit 8b767c6

Browse files
committed
---
yaml --- r: 139177 b: refs/heads/try2 c: baf6a63 h: refs/heads/master i: 139175: 2b4707b v: v3
1 parent 4a6d305 commit 8b767c6

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 4055fe83f671abe8b3e3fa7118d271692b13ca2b
8+
refs/heads/try2: baf6a6373f60ff3c74e64eae077af8f09e27ecf4
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustdoc/doc.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ use core::vec;
1919

2020
pub type AstId = int;
2121

22-
#[deriving_eq]
22+
#[deriving(Eq)]
2323
pub struct Doc {
2424
pages: ~[Page]
2525
}
2626

27-
#[deriving_eq]
27+
#[deriving(Eq)]
2828
pub enum Page {
2929
CratePage(CrateDoc),
3030
ItemPage(ItemTag)
3131
}
3232

33-
#[deriving_eq]
33+
#[deriving(Eq)]
3434
pub enum Implementation {
3535
Required,
3636
Provided,
@@ -40,7 +40,7 @@ pub enum Implementation {
4040
* Most rustdocs can be parsed into 'sections' according to their markdown
4141
* headers
4242
*/
43-
#[deriving_eq]
43+
#[deriving(Eq)]
4444
pub struct Section {
4545
header: ~str,
4646
body: ~str
@@ -49,12 +49,12 @@ pub struct Section {
4949
// FIXME (#2596): We currently give topmod the name of the crate. There
5050
// would probably be fewer special cases if the crate had its own name
5151
// and topmod's name was the empty string.
52-
#[deriving_eq]
52+
#[deriving(Eq)]
5353
pub struct CrateDoc {
5454
topmod: ModDoc
5555
}
5656

57-
#[deriving_eq]
57+
#[deriving(Eq)]
5858
pub enum ItemTag {
5959
ModTag(ModDoc),
6060
NmodTag(NmodDoc),
@@ -67,7 +67,7 @@ pub enum ItemTag {
6767
StructTag(StructDoc)
6868
}
6969

70-
#[deriving_eq]
70+
#[deriving(Eq)]
7171
pub struct ItemDoc {
7272
id: AstId,
7373
name: ~str,
@@ -79,20 +79,20 @@ pub struct ItemDoc {
7979
reexport: bool
8080
}
8181

82-
#[deriving_eq]
82+
#[deriving(Eq)]
8383
pub struct SimpleItemDoc {
8484
item: ItemDoc,
8585
sig: Option<~str>
8686
}
8787

88-
#[deriving_eq]
88+
#[deriving(Eq)]
8989
pub struct ModDoc {
9090
item: ItemDoc,
9191
items: ~[ItemTag],
9292
index: Option<Index>
9393
}
9494

95-
#[deriving_eq]
95+
#[deriving(Eq)]
9696
pub struct NmodDoc {
9797
item: ItemDoc,
9898
fns: ~[FnDoc],
@@ -103,26 +103,26 @@ pub type ConstDoc = SimpleItemDoc;
103103

104104
pub type FnDoc = SimpleItemDoc;
105105

106-
#[deriving_eq]
106+
#[deriving(Eq)]
107107
pub struct EnumDoc {
108108
item: ItemDoc,
109109
variants: ~[VariantDoc]
110110
}
111111

112-
#[deriving_eq]
112+
#[deriving(Eq)]
113113
pub struct VariantDoc {
114114
name: ~str,
115115
desc: Option<~str>,
116116
sig: Option<~str>
117117
}
118118

119-
#[deriving_eq]
119+
#[deriving(Eq)]
120120
pub struct TraitDoc {
121121
item: ItemDoc,
122122
methods: ~[MethodDoc]
123123
}
124124

125-
#[deriving_eq]
125+
#[deriving(Eq)]
126126
pub struct MethodDoc {
127127
name: ~str,
128128
brief: Option<~str>,
@@ -132,7 +132,7 @@ pub struct MethodDoc {
132132
implementation: Implementation,
133133
}
134134

135-
#[deriving_eq]
135+
#[deriving(Eq)]
136136
pub struct ImplDoc {
137137
item: ItemDoc,
138138
trait_types: ~[~str],
@@ -142,14 +142,14 @@ pub struct ImplDoc {
142142

143143
pub type TyDoc = SimpleItemDoc;
144144

145-
#[deriving_eq]
145+
#[deriving(Eq)]
146146
pub struct StructDoc {
147147
item: ItemDoc,
148148
fields: ~[~str],
149149
sig: Option<~str>
150150
}
151151

152-
#[deriving_eq]
152+
#[deriving(Eq)]
153153
pub struct Index {
154154
entries: ~[IndexEntry]
155155
}
@@ -164,7 +164,7 @@ pub struct Index {
164164
* * brief - The brief description
165165
* * link - A format-specific string representing the link target
166166
*/
167-
#[deriving_eq]
167+
#[deriving(Eq)]
168168
pub struct IndexEntry {
169169
kind: ~str,
170170
name: ~str,

0 commit comments

Comments
 (0)