Skip to content

Commit 409d8af

Browse files
brsonbrson
committed
rustdoc: deny(deprecated_mode)
1 parent 1ee9452 commit 409d8af

16 files changed

+70
-69
lines changed

‎src/librustdoc/astsrv.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,19 @@ impl Srv: Clone {
6262
fn clone(&self) -> Srv { copy *self }
6363
}
6464

65-
pub fn from_str<T>(source: ~str, owner: SrvOwner<T>) -> T {
65+
pub fn from_str<T>(+source: ~str, owner: SrvOwner<T>) -> T {
6666
run(owner, copy source, parse::from_str_sess)
6767
}
6868

69-
pub fn from_file<T>(file: ~str, owner: SrvOwner<T>) -> T {
69+
pub fn from_file<T>(+file: ~str, owner: SrvOwner<T>) -> T {
7070
run(owner, copy file, |sess, f| parse::from_file_sess(sess, &Path(f)))
7171
}
7272

73-
fn run<T>(owner: SrvOwner<T>, source: ~str, +parse: Parser) -> T {
73+
fn run<T>(owner: SrvOwner<T>, +source: ~str, +parse: Parser) -> T {
7474

7575
let srv_ = Srv({
7676
ch: do util::spawn_listener |copy source, move parse, po| {
77-
act(po, copy source, parse);
77+
act(po, copy source, copy parse);
7878
}
7979
});
8080

@@ -83,7 +83,7 @@ fn run<T>(owner: SrvOwner<T>, source: ~str, +parse: Parser) -> T {
8383
move res
8484
}
8585

86-
fn act(po: oldcomm::Port<Msg>, source: ~str, parse: Parser) {
86+
fn act(po: oldcomm::Port<Msg>, +source: ~str, +parse: Parser) {
8787
let sess = build_session();
8888

8989
let ctxt = build_ctxt(

‎src/librustdoc/attr_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ fn fold_trait(
221221
fn merge_method_attrs(
222222
srv: astsrv::Srv,
223223
item_id: doc::AstId,
224-
docs: ~[doc::MethodDoc]
224+
+docs: ~[doc::MethodDoc]
225225
) -> ~[doc::MethodDoc] {
226226
227227
// Create an assoc list from method name to attributes
@@ -319,7 +319,7 @@ mod test {
319319
use doc;
320320
use extract;
321321

322-
pub fn mk_doc(source: ~str) -> doc::Doc {
322+
pub fn mk_doc(+source: ~str) -> doc::Doc {
323323
do astsrv::from_str(copy source) |srv| {
324324
let doc = extract::from_srv(srv, ~"");
325325
run(srv, doc)

‎src/librustdoc/demo.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ enum OmNomNomy {
3939
}
4040

4141
fn take_my_order_please(
42-
_waitperson: WaitPerson,
43-
_order: ~[OmNomNomy]
42+
+_waitperson: WaitPerson,
43+
+_order: ~[OmNomNomy]
4444
) -> uint {
4545

4646
/*!

‎src/librustdoc/desc_to_brief_pass.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fn fold_item(fold: &fold::Fold<()>, +doc: doc::ItemDoc) -> doc::ItemDoc {
5252
let doc = fold::default_seq_fold_item(fold, doc);
5353

5454
doc::ItemDoc {
55-
brief: extract(doc.desc),
55+
brief: extract(copy doc.desc),
5656
.. doc
5757
}
5858
}
@@ -62,7 +62,7 @@ fn fold_trait(fold: &fold::Fold<()>, +doc: doc::TraitDoc) -> doc::TraitDoc {
6262

6363
doc::TraitDoc {
6464
methods: par::map(doc.methods, |doc| doc::MethodDoc {
65-
brief: extract(doc.desc),
65+
brief: extract(copy doc.desc),
6666
.. copy *doc
6767
}),
6868
.. doc
@@ -74,7 +74,7 @@ fn fold_impl(fold: &fold::Fold<()>, +doc: doc::ImplDoc) -> doc::ImplDoc {
7474

7575
doc::ImplDoc {
7676
methods: par::map(doc.methods, |doc| doc::MethodDoc {
77-
brief: extract(doc.desc),
77+
brief: extract(copy doc.desc),
7878
.. copy *doc
7979
}),
8080
.. doc
@@ -108,7 +108,7 @@ pub mod test {
108108
use doc;
109109
use extract;
110110

111-
pub fn mk_doc(source: ~str) -> doc::Doc {
111+
pub fn mk_doc(+source: ~str) -> doc::Doc {
112112
do astsrv::from_str(copy source) |srv| {
113113
let doc = extract::from_srv(srv, ~"");
114114
let doc = (attr_pass::mk_pass().f)(srv, doc);
@@ -117,15 +117,15 @@ pub mod test {
117117
}
118118
}
119119

120-
fn extract(desc: Option<~str>) -> Option<~str> {
120+
fn extract(+desc: Option<~str>) -> Option<~str> {
121121
if desc.is_none() {
122122
return None
123123
}
124124

125125
parse_desc((copy desc).get())
126126
}
127127

128-
fn parse_desc(desc: ~str) -> Option<~str> {
128+
fn parse_desc(+desc: ~str) -> Option<~str> {
129129

130130
const max_brief_len: uint = 120u;
131131

@@ -141,7 +141,7 @@ fn parse_desc(desc: ~str) -> Option<~str> {
141141
}
142142
}
143143

144-
fn first_sentence(s: ~str) -> Option<~str> {
144+
fn first_sentence(+s: ~str) -> Option<~str> {
145145
let paras = paragraphs(copy s);
146146
if !paras.is_empty() {
147147
let first_para = vec::head(paras);
@@ -151,7 +151,7 @@ fn first_sentence(s: ~str) -> Option<~str> {
151151
}
152152
}
153153
154-
fn first_sentence_(s: ~str) -> ~str {
154+
fn first_sentence_(+s: ~str) -> ~str {
155155
let mut dotcount = 0;
156156
// The index of the character following a single dot. This allows
157157
// Things like [0..1) to appear in the brief description
@@ -182,7 +182,7 @@ fn first_sentence_(s: ~str) -> ~str {
182182
}
183183
}
184184

185-
fn paragraphs(s: ~str) -> ~[~str] {
185+
fn paragraphs(+s: ~str) -> ~[~str] {
186186
let lines = str::lines_any(s);
187187
let mut whitespace_lines = 0;
188188
let mut accum = ~"";
@@ -233,7 +233,7 @@ fn test_paragraphs_2() {
233233
#[test]
234234
fn should_promote_short_descs() {
235235
let desc = Some(~"desc");
236-
let brief = extract(desc);
236+
let brief = extract(copy desc);
237237
assert brief == desc;
238238
}
239239

‎src/librustdoc/escape_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub fn mk_pass() -> Pass {
1919
text_pass::mk_pass(~"escape", escape)
2020
}
2121

22-
fn escape(s: ~str) -> ~str {
22+
fn escape(s: &str) -> ~str {
2323
str::replace(s, ~"\\", ~"\\\\")
2424
}
2525

‎src/librustdoc/extract.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fn top_moddoc_from_crate(
7171
+default_name: ~str
7272
) -> doc::ModDoc {
7373
moddoc_from_mod(mk_itemdoc(ast::crate_node_id, default_name),
74-
crate.node.module)
74+
copy crate.node.module)
7575
}
7676

7777
fn mk_itemdoc(id: ast::node_id, +name: ~str) -> doc::ItemDoc {
@@ -88,7 +88,7 @@ fn mk_itemdoc(id: ast::node_id, +name: ~str) -> doc::ItemDoc {
8888

8989
fn moddoc_from_mod(
9090
+itemdoc: doc::ItemDoc,
91-
module_: ast::_mod
91+
+module_: ast::_mod
9292
) -> doc::ModDoc {
9393
doc::ModDoc {
9494
item: itemdoc,
@@ -149,7 +149,7 @@ fn moddoc_from_mod(
149149

150150
fn nmoddoc_from_mod(
151151
+itemdoc: doc::ItemDoc,
152-
module_: ast::foreign_mod
152+
+module_: ast::foreign_mod
153153
) -> doc::NmodDoc {
154154
let mut fns = ~[];
155155
for module_.items.each |item| {
@@ -273,7 +273,7 @@ fn should_extract_trait_methods() {
273273

274274
fn impldoc_from_impl(
275275
+itemdoc: doc::ItemDoc,
276-
methods: ~[@ast::method]
276+
+methods: ~[@ast::method]
277277
) -> doc::ImplDoc {
278278
doc::ImplDoc {
279279
item: itemdoc,

‎src/librustdoc/page_pass.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fn make_doc_from_pages(page_port: PagePort) -> doc::Doc {
8181
}
8282
}
8383

84-
fn find_pages(doc: doc::Doc, page_chan: PageChan) {
84+
fn find_pages(+doc: doc::Doc, page_chan: PageChan) {
8585
let fold = Fold {
8686
fold_crate: fold_crate,
8787
fold_mod: fold_mod,
@@ -101,7 +101,7 @@ fn fold_crate(
101101
let doc = fold::default_seq_fold_crate(fold, doc);
102102

103103
let page = doc::CratePage(doc::CrateDoc {
104-
topmod: strip_mod(doc.topmod),
104+
topmod: strip_mod(copy doc.topmod),
105105
.. copy doc
106106
});
107107

@@ -119,15 +119,15 @@ fn fold_mod(
119119

120120
if doc.id() != ast::crate_node_id {
121121

122-
let doc = strip_mod(doc);
122+
let doc = strip_mod(copy doc);
123123
let page = doc::ItemPage(doc::ModTag(doc));
124124
oldcomm::send(fold.ctxt.op, Some(page));
125125
}
126126

127127
doc
128128
}
129129

130-
fn strip_mod(doc: doc::ModDoc) -> doc::ModDoc {
130+
fn strip_mod(+doc: doc::ModDoc) -> doc::ModDoc {
131131
doc::ModDoc {
132132
items: do doc.items.filtered |item| {
133133
match *item {
@@ -193,15 +193,15 @@ mod test {
193193

194194
pub fn mk_doc_(
195195
output_style: config::OutputStyle,
196-
source: ~str
196+
+source: ~str
197197
) -> doc::Doc {
198198
do astsrv::from_str(copy source) |srv| {
199199
let doc = extract::from_srv(srv, ~"");
200200
run(srv, doc, output_style)
201201
}
202202
}
203203

204-
pub fn mk_doc(source: ~str) -> doc::Doc {
204+
pub fn mk_doc(+source: ~str) -> doc::Doc {
205205
mk_doc_(config::DocPerMod, copy source)
206206
}
207207
}

‎src/librustdoc/prune_hidden_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn fold_mod(
5050
}
5151
}
5252

53-
fn is_hidden(srv: astsrv::Srv, doc: doc::ItemDoc) -> bool {
53+
fn is_hidden(srv: astsrv::Srv, +doc: doc::ItemDoc) -> bool {
5454
use syntax::ast_map;
5555

5656
let id = doc.id;
@@ -76,7 +76,7 @@ pub mod test {
7676
use extract;
7777
use prune_hidden_pass::run;
7878

79-
pub fn mk_doc(source: ~str) -> doc::Doc {
79+
pub fn mk_doc(+source: ~str) -> doc::Doc {
8080
do astsrv::from_str(copy source) |srv| {
8181
let doc = extract::from_srv(srv, ~"");
8282
run(srv, doc)

‎src/librustdoc/prune_private_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fn fold_mod(
5151
}
5252
}
5353

54-
fn is_visible(srv: astsrv::Srv, doc: doc::ItemDoc) -> bool {
54+
fn is_visible(srv: astsrv::Srv, +doc: doc::ItemDoc) -> bool {
5555
use syntax::ast_map;
5656
use syntax::ast;
5757

@@ -80,7 +80,7 @@ pub mod test {
8080
use extract;
8181
use prune_private_pass::run;
8282

83-
pub fn mk_doc(source: ~str) -> doc::Doc {
83+
pub fn mk_doc(+source: ~str) -> doc::Doc {
8484
do astsrv::from_str(copy source) |srv| {
8585
let doc = extract::from_srv(srv, ~"");
8686
run(srv, doc)

‎src/librustdoc/rustdoc.rc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#[legacy_records];
2525

2626
#[allow(non_implicitly_copyable_typarams)];
27-
#[allow(deprecated_mode)];
2827
#[allow(deprecated_self)];
2928

3029
extern mod core(vers = "0.6");
@@ -89,7 +88,7 @@ fn main() {
8988
}
9089

9190
/// Runs rustdoc over the given file
92-
fn run(config: Config) {
91+
fn run(+config: Config) {
9392

9493
let source_file = copy config.input_crate;
9594

@@ -148,7 +147,7 @@ fn run(config: Config) {
148147
}
149148
}
150149

151-
fn time<T>(what: ~str, f: fn() -> T) -> T {
150+
fn time<T>(+what: ~str, f: fn() -> T) -> T {
152151
let start = std::time::precise_time_s();
153152
let rv = f();
154153
let end = std::time::precise_time_s();

‎src/librustdoc/sectionalize_pass.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub fn run(_srv: astsrv::Srv, +doc: doc::Doc) -> doc::Doc {
4444

4545
fn fold_item(fold: &fold::Fold<()>, +doc: doc::ItemDoc) -> doc::ItemDoc {
4646
let doc = fold::default_seq_fold_item(fold, doc);
47-
let (desc, sections) = sectionalize(doc.desc);
47+
let (desc, sections) = sectionalize(copy doc.desc);
4848

4949
doc::ItemDoc {
5050
desc: desc,
@@ -58,7 +58,7 @@ fn fold_trait(fold: &fold::Fold<()>, +doc: doc::TraitDoc) -> doc::TraitDoc {
5858

5959
doc::TraitDoc {
6060
methods: do par::map(doc.methods) |method| {
61-
let (desc, sections) = sectionalize(method.desc);
61+
let (desc, sections) = sectionalize(copy method.desc);
6262

6363
doc::MethodDoc {
6464
desc: desc,
@@ -75,7 +75,7 @@ fn fold_impl(fold: &fold::Fold<()>, +doc: doc::ImplDoc) -> doc::ImplDoc {
7575

7676
doc::ImplDoc {
7777
methods: do par::map(doc.methods) |method| {
78-
let (desc, sections) = sectionalize(method.desc);
78+
let (desc, sections) = sectionalize(copy method.desc);
7979

8080
doc::MethodDoc {
8181
desc: desc,
@@ -87,7 +87,7 @@ fn fold_impl(fold: &fold::Fold<()>, +doc: doc::ImplDoc) -> doc::ImplDoc {
8787
}
8888
}
8989

90-
fn sectionalize(desc: Option<~str>) -> (Option<~str>, ~[doc::Section]) {
90+
fn sectionalize(+desc: Option<~str>) -> (Option<~str>, ~[doc::Section]) {
9191

9292
/*!
9393
* Take a description of the form
@@ -156,7 +156,7 @@ fn sectionalize(desc: Option<~str>) -> (Option<~str>, ~[doc::Section]) {
156156
(new_desc, sections)
157157
}
158158

159-
fn parse_header(line: ~str) -> Option<~str> {
159+
fn parse_header(+line: ~str) -> Option<~str> {
160160
if str::starts_with(line, ~"# ") {
161161
Some(str::slice(line, 2u, str::len(line)))
162162
} else {
@@ -259,7 +259,7 @@ pub mod test {
259259
use extract;
260260
use sectionalize_pass::run;
261261
262-
pub fn mk_doc(source: ~str) -> doc::Doc {
262+
pub fn mk_doc(+source: ~str) -> doc::Doc {
263263
do astsrv::from_str(copy source) |srv| {
264264
let doc = extract::from_srv(srv, ~"");
265265
let doc = (attr_pass::mk_pass().f)(srv, doc);

‎src/librustdoc/sort_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub type ItemLtEqOp = pure fn~(v1: &doc::ItemTag, v2: &doc::ItemTag) -> bool;
2727

2828
type ItemLtEq = NominalOp<ItemLtEqOp>;
2929

30-
pub fn mk_pass(name: ~str, +lteq: ItemLtEqOp) -> Pass {
30+
pub fn mk_pass(+name: ~str, +lteq: ItemLtEqOp) -> Pass {
3131
Pass {
3232
name: copy name,
3333
f: fn~(move lteq, srv: astsrv::Srv, +doc: doc::Doc) -> doc::Doc {

0 commit comments

Comments
 (0)