mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #5339 : catamorphism/rust/less-copy, r=catamorphism

Browse Source
This commit is contained in:
bors 2013-03-13 13:57:56 -07:00
commit 67b0f3d5b2
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librust/rust.rc
View File

@ -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)];

7
src/librustc/middle/trans/base.rs
View File

@ -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 => ~[]