diff options
| author | bors <bors@rust-lang.org> | 2013-03-13 13:57:56 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-13 13:57:56 -0700 |
| commit | 67b0f3d5b2d88ea9b5c0a667fc3dbdf794e5c054 (patch) | |
| tree | d6e25209c0e2ac3cdd7823e9048df23d692eba16 | |
| parent | 4d8ddff52a60d3785052f1e0a231cb95c98fdc24 (diff) | |
| parent | f9269a1bda7a8e128ce52327df35cd645332a77e (diff) | |
| download | rust-67b0f3d5b2d88ea9b5c0a667fc3dbdf794e5c054.tar.gz rust-67b0f3d5b2d88ea9b5c0a667fc3dbdf794e5c054.zip | |
auto merge of #5339 : catamorphism/rust/less-copy, r=catamorphism
| -rw-r--r-- | src/librust/rust.rc | 4 | ||||
| -rw-r--r-- | src/librustc/middle/trans/base.rs | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/librust/rust.rc b/src/librust/rust.rc index 082861e0ae0..8fd9fea6bae 100644 --- a/src/librust/rust.rc +++ b/src/librust/rust.rc @@ -9,8 +9,8 @@ // except according to those terms. // rust - central access to other rust tools -// XXX: Make commands run and test emit proper file endings on winds -// XXX: Make run only accept source that emits an executable +// FIXME #2238 Make commands run and test emit proper file endings on winds +// FIXME #2238 Make run only accept source that emits an executable #[deny(deprecated_self)]; diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index ac315a36e40..31779a765d7 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -867,7 +867,7 @@ pub fn in_lpad_scope_cx(bcx: block, f: &fn(+si: &mut scope_info)) { let mut bcx = bcx; loop { { - // XXX: Borrow check bug workaround. + // FIXME #4280: Borrow check bug workaround. let kind: &mut block_kind = &mut *bcx.kind; match *kind { block_scope(ref mut inf) => { @@ -1272,7 +1272,7 @@ pub fn cleanup_and_leave(bcx: block, } { - // XXX: Borrow check bug workaround. + // FIXME #4280: Borrow check bug workaround. let kind: &mut block_kind = &mut *cur.kind; match *kind { block_scope(ref mut inf) if !inf.cleanups.is_empty() => { @@ -1850,8 +1850,7 @@ pub fn trans_enum_variant(ccx: @CrateContext, }; let fcx = new_fn_ctxt_w_id(ccx, ~[], llfndecl, variant.node.id, None, param_substs, None); - // XXX: Bad copy. - let raw_llargs = create_llargs_for_fn_args(fcx, no_self, copy fn_args); + let raw_llargs = create_llargs_for_fn_args(fcx, no_self, fn_args); let ty_param_substs = match param_substs { Some(ref substs) => /*bad*/copy substs.tys, None => ~[] |