Skip to content

Commit 5099123

Browse files
committed
---
yaml --- r: 39204 b: refs/heads/incoming c: f02e9db h: refs/heads/master v: v3
1 parent 46dd39f commit 5099123

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: d1ebdbeb6c00fe7d119ce17cabb303c5731f9bf7
9+
refs/heads/incoming: f02e9db212199e7d7e70b0330b8ea76caaaa0ea9
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/lint.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,6 @@ fn check_pat(tcx: ty::ctxt, pat: @ast::pat) {
782782
span,
783783
fmt!("binding `%s` should use ref or copy mode",
784784
tcx.sess.str_of(path_to_ident(path))));
785-
tcx.bad_bindings.insert(id, ());
786785
}
787786
}
788787
}

branches/incoming/src/librustc/middle/ty.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,7 @@ type ctxt =
429429
destructor_for_type: HashMap<ast::def_id, ast::def_id>,
430430

431431
// A method will be in this list if and only if it is a destructor.
432-
destructors: HashMap<ast::def_id, ()>,
433-
434-
// Records the value mode (read, copy, or move) for every value.
435-
value_modes: HashMap<ast::node_id, ValueMode>,
432+
destructors: HashMap<ast::def_id, ()>
436433
};
437434

438435
enum tbox_flag {
@@ -971,8 +968,7 @@ fn mk_ctxt(s: session::Session,
971968
automatically_derived_methods: HashMap(),
972969
automatically_derived_methods_for_impl: HashMap(),
973970
destructor_for_type: HashMap(),
974-
destructors: HashMap(),
975-
value_modes: HashMap()}
971+
destructors: HashMap()}
976972
}
977973

978974

0 commit comments

Comments
 (0)