Skip to content

Commit 30f6422

Browse files
erickterickt
committed
---
yaml --- r: 44713 b: refs/heads/master c: f14409c h: refs/heads/master i: 44711: 1c8e92f v: v3
1 parent e0bccff commit 30f6422

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1062
-923
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 9ac5262bdf27c964d1e9496479994aff2ae80acc
2+
refs/heads/master: f14409c528125836a5cbe9d4d7a39b8d6695f7b1
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
55
refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

‎trunk/src/libfuzzer/fuzzer.rc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ pub pure fn safe_to_use_expr(e: ast::expr, tm: test_mode) -> bool {
134134

135135
pub fn safe_to_steal_ty(t: @ast::Ty, tm: test_mode) -> bool {
136136
// Restrictions happen to be the same.
137-
safe_to_replace_ty(t.node, tm)
137+
safe_to_replace_ty(&t.node, tm)
138138
}
139139

140140
// Not type-parameterized: https://github.com/mozilla/rust/issues/898 (FIXED)
@@ -175,8 +175,8 @@ pub fn steal(crate: ast::crate, tm: test_mode) -> StolenStuff {
175175
}
176176

177177

178-
pub fn safe_to_replace_expr(e: ast::expr_, _tm: test_mode) -> bool {
179-
match e {
178+
pub fn safe_to_replace_expr(e: &ast::expr_, _tm: test_mode) -> bool {
179+
match *e {
180180
// https://github.com/mozilla/rust/issues/652
181181
ast::expr_if(*) => { false }
182182
ast::expr_block(_) => { false }
@@ -188,8 +188,8 @@ pub fn safe_to_replace_expr(e: ast::expr_, _tm: test_mode) -> bool {
188188
}
189189
}
190190

191-
pub fn safe_to_replace_ty(t: ast::ty_, _tm: test_mode) -> bool {
192-
match t {
191+
pub fn safe_to_replace_ty(t: &ast::ty_, _tm: test_mode) -> bool {
192+
match *t {
193193
ast::ty_infer => { false } // always implicit, always top level
194194
ast::ty_bot => { false } // in source, can only appear
195195
// as the out type of a function
@@ -204,7 +204,7 @@ pub fn replace_expr_in_crate(crate: ast::crate, i: uint,
204204
ast::crate {
205205
let j: @mut uint = @mut 0u;
206206
fn fold_expr_rep(j_: @mut uint, i_: uint, newexpr_: ast::expr_,
207-
original: ast::expr_, fld: fold::ast_fold,
207+
original: &ast::expr_, fld: fold::ast_fold,
208208
tm_: test_mode) ->
209209
ast::expr_ {
210210
*j_ += 1u;
@@ -221,7 +221,7 @@ pub fn replace_expr_in_crate(crate: ast::crate, i: uint,
221221
.. *fold::default_ast_fold()
222222
};
223223
let af = fold::make_fold(afp);
224-
let crate2: @ast::crate = @af.fold_crate(crate);
224+
let crate2: @ast::crate = @af.fold_crate(&crate);
225225
*crate2
226226
}
227227

@@ -231,7 +231,7 @@ pub fn replace_ty_in_crate(crate: ast::crate, i: uint, newty: ast::Ty,
231231
tm: test_mode) -> ast::crate {
232232
let j: @mut uint = @mut 0u;
233233
fn fold_ty_rep(j_: @mut uint, i_: uint, newty_: ast::ty_,
234-
original: ast::ty_, fld: fold::ast_fold,
234+
original: &ast::ty_, fld: fold::ast_fold,
235235
tm_: test_mode) ->
236236
ast::ty_ {
237237
*j_ += 1u;
@@ -244,7 +244,7 @@ pub fn replace_ty_in_crate(crate: ast::crate, i: uint, newty: ast::Ty,
244244
.. *fold::default_ast_fold()
245245
};
246246
let af = fold::make_fold(afp);
247-
let crate2: @ast::crate = @af.fold_crate(crate);
247+
let crate2: @ast::crate = @af.fold_crate(&crate);
248248
*crate2
249249
}
250250

‎trunk/src/librustc/driver/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ pub fn pretty_print_input(sess: Session, +cfg: ast::crate_cfg, input: input,
396396
pprust::node_block(s, ref blk) => {
397397
pp::space(s.s);
398398
pprust::synth_comment(
399-
s, ~"block " + int::to_str((*blk).node.id));
399+
s, ~"block " + int::to_str(blk.node.id));
400400
}
401401
pprust::node_expr(s, expr) => {
402402
pp::space(s.s);

‎trunk/src/librustc/front/config.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub fn strip_items(crate: @ast::crate, in_cfg: in_cfg_pred)
4545
.. *fold::default_ast_fold()};
4646

4747
let fold = fold::make_fold(precursor);
48-
let res = @fold.fold_crate(*crate);
48+
let res = @fold.fold_crate(&*crate);
4949
return res;
5050
}
5151

@@ -63,7 +63,7 @@ fn filter_view_item(cx: @Context, &&view_item: @ast::view_item
6363
}
6464
}
6565

66-
fn fold_mod(cx: @Context, m: ast::_mod, fld: fold::ast_fold) -> ast::_mod {
66+
fn fold_mod(cx: @Context, m: &ast::_mod, fld: fold::ast_fold) -> ast::_mod {
6767
let filtered_items =
6868
m.items.filter_mapped(|a| filter_item(cx, *a));
6969
let filtered_view_items =
@@ -83,7 +83,7 @@ fn filter_foreign_item(cx: @Context, &&item: @ast::foreign_item) ->
8383

8484
fn fold_foreign_mod(
8585
cx: @Context,
86-
nm: ast::foreign_mod,
86+
nm: &ast::foreign_mod,
8787
fld: fold::ast_fold
8888
) -> ast::foreign_mod {
8989
let filtered_items =
@@ -98,21 +98,21 @@ fn fold_foreign_mod(
9898
}
9999
}
100100

101-
fn fold_item_underscore(cx: @Context, +item: ast::item_,
101+
fn fold_item_underscore(cx: @Context, item: &ast::item_,
102102
fld: fold::ast_fold) -> ast::item_ {
103-
let item = match item {
104-
ast::item_impl(a, b, c, methods) => {
103+
let item = match *item {
104+
ast::item_impl(ref a, b, c, ref methods) => {
105105
let methods = methods.filtered(|m| method_in_cfg(cx, *m) );
106-
ast::item_impl(a, b, c, methods)
106+
ast::item_impl(/*bad*/ copy *a, b, c, methods)
107107
}
108108
ast::item_trait(ref a, ref b, ref methods) => {
109109
let methods = methods.filtered(|m| trait_method_in_cfg(cx, m) );
110110
ast::item_trait(/*bad*/copy *a, /*bad*/copy *b, methods)
111111
}
112-
item => item
112+
ref item => /*bad*/ copy *item
113113
};
114114

115-
fold::noop_fold_item_underscore(item, fld)
115+
fold::noop_fold_item_underscore(&item, fld)
116116
}
117117

118118
fn filter_stmt(cx: @Context, &&stmt: @ast::stmt) ->
@@ -134,7 +134,7 @@ fn filter_stmt(cx: @Context, &&stmt: @ast::stmt) ->
134134

135135
fn fold_block(
136136
cx: @Context,
137-
b: ast::blk_,
137+
b: &ast::blk_,
138138
fld: fold::ast_fold
139139
) -> ast::blk_ {
140140
let filtered_stmts =

‎trunk/src/librustc/front/core_inject.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,13 @@ fn inject_libcore_ref(sess: Session,
6666
view_items: vis,
6767
../*bad*/copy crate.module
6868
};
69-
new_module = fld.fold_mod(new_module);
69+
new_module = fld.fold_mod(&new_module);
7070

7171
// FIXME #2543: Bad copy.
72-
let new_crate = ast::crate_ { module: new_module, ..copy crate };
72+
let new_crate = ast::crate_ {
73+
module: new_module,
74+
..copy *crate
75+
};
7376
(new_crate, span)
7477
},
7578
fold_mod: |module, fld| {
@@ -95,12 +98,15 @@ fn inject_libcore_ref(sess: Session,
9598
let vis = vec::append(~[vi2], module.view_items);
9699

97100
// FIXME #2543: Bad copy.
98-
let new_module = ast::_mod { view_items: vis, ..copy module };
99-
fold::noop_fold_mod(new_module, fld)
101+
let new_module = ast::_mod {
102+
view_items: vis,
103+
..copy *module
104+
};
105+
fold::noop_fold_mod(&new_module, fld)
100106
},
101107
..*fold::default_ast_fold()
102108
};
103109

104110
let fold = fold::make_fold(precursor);
105-
@fold.fold_crate(*crate)
111+
@fold.fold_crate(crate)
106112
}

‎trunk/src/librustc/front/test.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ fn generate_test_harness(sess: session::Session,
9191
fold_mod: |a,b| fold_mod(cx, a, b),.. *fold::default_ast_fold()};
9292

9393
let fold = fold::make_fold(precursor);
94-
let res = @fold.fold_crate(*crate);
94+
let res = @fold.fold_crate(&*crate);
9595
cx.ext_cx.bt_pop();
9696
return res;
9797
}
@@ -106,7 +106,7 @@ fn strip_test_functions(crate: @ast::crate) -> @ast::crate {
106106
}
107107

108108
fn fold_mod(cx: @mut TestCtxt,
109-
m: ast::_mod,
109+
m: &ast::_mod,
110110
fld: fold::ast_fold)
111111
-> ast::_mod {
112112
// Remove any #[main] from the AST so it doesn't clash with
@@ -125,19 +125,21 @@ fn fold_mod(cx: @mut TestCtxt,
125125
items: vec::map(m.items, |i| nomain(cx, *i)),
126126
};
127127

128-
fold::noop_fold_mod(mod_nomain, fld)
128+
fold::noop_fold_mod(&mod_nomain, fld)
129129
}
130130

131131
fn fold_crate(cx: @mut TestCtxt,
132-
c: ast::crate_,
132+
c: &ast::crate_,
133133
fld: fold::ast_fold)
134134
-> ast::crate_ {
135135
let folded = fold::noop_fold_crate(c, fld);
136136

137137
// Add a special __test module to the crate that will contain code
138138
// generated for the test harness
139-
ast::crate_ { module: add_test_module(cx, /*bad*/copy folded.module),
140-
.. folded }
139+
ast::crate_ {
140+
module: add_test_module(cx, &folded.module),
141+
.. folded
142+
}
141143
}
142144

143145

@@ -238,11 +240,11 @@ fn should_fail(i: @ast::item) -> bool {
238240
vec::len(attr::find_attrs_by_name(i.attrs, ~"should_fail")) > 0u
239241
}
240242

241-
fn add_test_module(cx: &TestCtxt, +m: ast::_mod) -> ast::_mod {
243+
fn add_test_module(cx: &TestCtxt, m: &ast::_mod) -> ast::_mod {
242244
let testmod = mk_test_module(cx);
243245
ast::_mod {
244246
items: vec::append_one(/*bad*/copy m.items, testmod),
245-
.. m
247+
.. /*bad*/ copy *m
246248
}
247249
}
248250

‎trunk/src/librustc/metadata/encoder.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ fn encode_path(ecx: @EncodeContext, ebml_w: writer::Encoder,
323323
}
324324

325325
fn encode_info_for_mod(ecx: @EncodeContext, ebml_w: writer::Encoder,
326-
md: _mod, id: node_id, path: &[ast_map::path_elt],
326+
md: &_mod, id: node_id, path: &[ast_map::path_elt],
327327
name: ident) {
328328
ebml_w.start_tag(tag_items_data_item);
329329
encode_def_id(ebml_w, local_def(id));
@@ -621,7 +621,7 @@ fn encode_info_for_item(ecx: @EncodeContext, ebml_w: writer::Encoder,
621621
}
622622
ebml_w.end_tag();
623623
}
624-
item_mod(m) => {
624+
item_mod(ref m) => {
625625
add_to_index();
626626
encode_info_for_mod(ecx, ebml_w, m, item.id, path, item.ident);
627627
}
@@ -856,8 +856,8 @@ fn encode_info_for_item(ecx: @EncodeContext, ebml_w: writer::Encoder,
856856
// method info, we output static methods with type signatures as
857857
// written. Here, we output the *real* type signatures. I feel like
858858
// maybe we should only ever handle the real type signatures.
859-
for vec::each((*ms)) |m| {
860-
let ty_m = ast_util::trait_method_to_ty_method(*m);
859+
for ms.each |m| {
860+
let ty_m = ast_util::trait_method_to_ty_method(m);
861861
if ty_m.self_ty.node != ast::sty_static { loop; }
862862
863863
index.push(entry { val: ty_m.id, pos: ebml_w.writer.tell() });
@@ -927,7 +927,7 @@ fn encode_info_for_items(ecx: @EncodeContext, ebml_w: writer::Encoder,
927927
let index = @mut ~[];
928928
ebml_w.start_tag(tag_items_data);
929929
index.push(entry { val: crate_node_id, pos: ebml_w.writer.tell() });
930-
encode_info_for_mod(ecx, ebml_w, crate.node.module,
930+
encode_info_for_mod(ecx, ebml_w, &crate.node.module,
931931
crate_node_id, ~[],
932932
syntax::parse::token::special_idents::invalid);
933933
visit::visit_crate(*crate, (), visit::mk_vt(@visit::Visitor {

‎trunk/src/librustc/middle/astencode.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ fn encode_ast(ebml_w: writer::Encoder, item: ast::inlined_item) {
298298
// nested items, as otherwise it would get confused when translating
299299
// inlined items.
300300
fn simplify_ast(ii: ast::inlined_item) -> ast::inlined_item {
301-
fn drop_nested_items(blk: ast::blk_, fld: fold::ast_fold) -> ast::blk_ {
301+
fn drop_nested_items(blk: &ast::blk_, fld: fold::ast_fold) -> ast::blk_ {
302302
let stmts_sans_items = do blk.stmts.filtered |stmt| {
303303
match stmt.node {
304304
ast::stmt_expr(_, _) | ast::stmt_semi(_, _) |
@@ -317,7 +317,7 @@ fn simplify_ast(ii: ast::inlined_item) -> ast::inlined_item {
317317
id: blk.id,
318318
rules: blk.rules
319319
};
320-
fold::noop_fold_block(blk_sans_items, fld)
320+
fold::noop_fold_block(&blk_sans_items, fld)
321321
}
322322
323323
let fld = fold::make_fold(@fold::AstFoldFns {
@@ -336,7 +336,7 @@ fn simplify_ast(ii: ast::inlined_item) -> ast::inlined_item {
336336
ast::ii_foreign(fld.fold_foreign_item(i))
337337
}
338338
ast::ii_dtor(ref dtor, nm, ref tps, parent_id) => {
339-
let dtor_body = fld.fold_block((*dtor).node.body);
339+
let dtor_body = fld.fold_block(&dtor.node.body);
340340
ast::ii_dtor(
341341
codemap::spanned {
342342
node: ast::struct_dtor_ { body: dtor_body,
@@ -372,7 +372,7 @@ fn renumber_ast(xcx: @ExtendedDecodeContext, ii: ast::inlined_item)
372372
ast::ii_foreign(fld.fold_foreign_item(i))
373373
}
374374
ast::ii_dtor(ref dtor, nm, ref tps, parent_id) => {
375-
let dtor_body = fld.fold_block((*dtor).node.body);
375+
let dtor_body = fld.fold_block(&dtor.node.body);
376376
let dtor_attrs = fld.fold_attributes(/*bad*/copy (*dtor).node.attrs);
377377
let new_params = fold::fold_ty_params(/*bad*/copy *tps, fld);
378378
let dtor_id = fld.new_id((*dtor).node.id);

‎trunk/src/librustc/middle/borrowck/check_loans.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,8 @@ impl CheckLoanCtxt {
580580
}
581581

582582
fn check_loans_in_fn(fk: &visit::fn_kind,
583-
decl: ast::fn_decl,
584-
body: ast::blk,
583+
decl: &ast::fn_decl,
584+
body: &ast::blk,
585585
sp: span,
586586
id: ast::node_id,
587587
&&self: @mut CheckLoanCtxt,
@@ -753,7 +753,7 @@ fn check_loans_in_expr(expr: @ast::expr,
753753
visit::visit_expr(expr, self, vt);
754754
}
755755

756-
fn check_loans_in_block(blk: ast::blk,
756+
fn check_loans_in_block(blk: &ast::blk,
757757
&&self: @mut CheckLoanCtxt,
758758
vt: visit::vt<@mut CheckLoanCtxt>) {
759759
do save_and_restore_managed(self.declared_purity) {

‎trunk/src/librustc/middle/borrowck/gather_loans.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ pub fn gather_loans(bccx: @BorrowckCtxt, crate: @ast::crate) -> ReqMaps {
9696
}
9797

9898
fn req_loans_in_fn(fk: &visit::fn_kind,
99-
decl: ast::fn_decl,
100-
body: ast::blk,
99+
decl: &ast::fn_decl,
100+
body: &ast::blk,
101101
sp: span,
102102
id: ast::node_id,
103103
&&self: @mut GatherLoanCtxt,
@@ -269,13 +269,13 @@ fn req_loans_in_expr(ex: @ast::expr,
269269
(vt.visit_expr)(cond, self, vt);
270270

271271
// during body, can only root for the body
272-
self.root_ub = (*body).node.id;
273-
(vt.visit_block)((*body), self, vt);
272+
self.root_ub = body.node.id;
273+
(vt.visit_block)(body, self, vt);
274274
}
275275

276276
// see explanation attached to the `root_ub` field:
277277
ast::expr_loop(ref body, _) => {
278-
self.root_ub = (*body).node.id;
278+
self.root_ub = body.node.id;
279279
visit::visit_expr(ex, self, vt);
280280
}
281281

‎trunk/src/librustc/middle/check_loop.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ pub fn check_crate(tcx: ty::ctxt, crate: @crate) {
3333
match e.node {
3434
expr_while(e, ref b) => {
3535
(v.visit_expr)(e, cx, v);
36-
(v.visit_block)((*b), Context { in_loop: true,.. cx }, v);
36+
(v.visit_block)(b, Context { in_loop: true,.. cx }, v);
3737
}
3838
expr_loop(ref b, _) => {
39-
(v.visit_block)((*b), Context { in_loop: true,.. cx }, v);
39+
(v.visit_block)(b, Context { in_loop: true,.. cx }, v);
4040
}
4141
expr_fn(*) => {
4242
visit::visit_expr(e, Context {
@@ -45,18 +45,18 @@ pub fn check_crate(tcx: ty::ctxt, crate: @crate) {
4545
}, v);
4646
}
4747
expr_fn_block(_, ref b) => {
48-
(v.visit_block)((*b), Context {
48+
(v.visit_block)(b, Context {
4949
in_loop: false,
5050
can_ret: false
5151
}, v);
5252
}
5353
expr_loop_body(@expr {node: expr_fn_block(_, ref b), _}) => {
5454
let sigil = ty::ty_closure_sigil(ty::expr_ty(tcx, e));
5555
let blk = (sigil == BorrowedSigil);
56-
(v.visit_block)((*b), Context {
56+
(v.visit_block)(b, Context {
5757
in_loop: true,
5858
can_ret: blk
59-
}, v);
59+
}, v);
6060
}
6161
expr_break(_) => {
6262
if !cx.in_loop {

0 commit comments

Comments
 (0)