Skip to content

Commit 28ed90e

Browse files
committed
---
yaml --- r: 50657 b: refs/heads/try c: ab5472a h: refs/heads/master i: 50655: ee2b777 v: v3
1 parent ca3a53f commit 28ed90e

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
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: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
5-
refs/heads/try: 852619d5d7ef7e9b9c5e57102e244c575f0c6a8f
5+
refs/heads/try: ab5472a7244896df20ceb7a12d9d30afc838f004
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librust/rust.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// except according to those terms.
1010

1111
// rust - central access to other rust tools
12-
// XXX: Make commands run and test emit proper file endings on winds
13-
// XXX: Make run only accept source that emits an executable
12+
// FIXME #2238 Make commands run and test emit proper file endings on winds
13+
// FIXME #2238 Make run only accept source that emits an executable
1414

1515
#[deny(deprecated_self)];
1616

branches/try/src/librustc/middle/trans/base.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ pub fn in_lpad_scope_cx(bcx: block, f: &fn(+si: &mut scope_info)) {
867867
let mut bcx = bcx;
868868
loop {
869869
{
870-
// XXX: Borrow check bug workaround.
870+
// FIXME #4280: Borrow check bug workaround.
871871
let kind: &mut block_kind = &mut *bcx.kind;
872872
match *kind {
873873
block_scope(ref mut inf) => {
@@ -1272,7 +1272,7 @@ pub fn cleanup_and_leave(bcx: block,
12721272
}
12731273

12741274
{
1275-
// XXX: Borrow check bug workaround.
1275+
// FIXME #4280: Borrow check bug workaround.
12761276
let kind: &mut block_kind = &mut *cur.kind;
12771277
match *kind {
12781278
block_scope(ref mut inf) if !inf.cleanups.is_empty() => {
@@ -1844,8 +1844,7 @@ pub fn trans_enum_variant(ccx: @CrateContext,
18441844
};
18451845
let fcx = new_fn_ctxt_w_id(ccx, ~[], llfndecl, variant.node.id, None,
18461846
param_substs, None);
1847-
// XXX: Bad copy.
1848-
let raw_llargs = create_llargs_for_fn_args(fcx, no_self, copy fn_args);
1847+
let raw_llargs = create_llargs_for_fn_args(fcx, no_self, fn_args);
18491848
let ty_param_substs = match param_substs {
18501849
Some(ref substs) => /*bad*/copy substs.tys,
18511850
None => ~[]

0 commit comments

Comments
 (0)