Skip to content

Commit fff145a

Browse files
committed
---
yaml --- r: 24063 b: refs/heads/master c: 77b0845 h: refs/heads/master i: 24061: d54a622 24059: 80caee6 24055: 15e9282 24047: 7891b45 24031: 7b4b51c 23999: 0677d6a 23935: 079d98f 23807: 208ddb9 23551: cb8536f v: v3
1 parent 57023d8 commit fff145a

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
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: 1983e3d8d7faed3e9e47d5589d3826398577b152
2+
refs/heads/master: 77b0845a84c481488c11a9fb5892fc823a9ce66d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/trans/base.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1721,7 +1721,8 @@ fn trans_class_ctor(ccx: @crate_ctxt, path: path, decl: ast::fn_decl,
17211721
let mut bcx_top = top_scope_block(fcx, body.info());
17221722
let lltop = bcx_top.llbb;
17231723
let arg_tys = ty::ty_fn_args(node_id_type(bcx_top, ctor_id));
1724-
bcx_top = copy_args_to_allocas(fcx, bcx_top, decl.inputs, raw_llargs, arg_tys);
1724+
bcx_top = copy_args_to_allocas(fcx, bcx_top, decl.inputs,
1725+
raw_llargs, arg_tys);
17251726

17261727
// Create a temporary for `self` that we will return at the end
17271728
let selfdatum = datum::scratch_datum(bcx_top, rslt_ty, true);

trunk/src/rustc/middle/trans/type_use.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ use syntax::ast_map;
2727
use common::*;
2828

2929
type type_uses = uint; // Bitmask
30-
const use_repr: uint = 1u; /* Dependency on size/alignment/mode and
31-
take/drop glue */
32-
const use_tydesc: uint = 2u; /* Takes the tydesc, or compares */
30+
const use_repr: uint = 1u; /* Dependency on size/alignment/mode and
31+
take/drop glue */
32+
const use_tydesc: uint = 2u; /* Takes the tydesc, or compares */
3333

3434
type ctx = {ccx: @crate_ctxt,
3535
uses: ~[mut type_uses]};

0 commit comments

Comments
 (0)