Skip to content

Commit 934b08b

Browse files
committed
---
yaml --- r: 30663 b: refs/heads/incoming c: 77b0845 h: refs/heads/master i: 30661: 8f66ebe 30659: fcf8f1e 30655: 0169c36 v: v3
1 parent 5c0a3f4 commit 934b08b

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
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 1983e3d8d7faed3e9e47d5589d3826398577b152
9+
refs/heads/incoming: 77b0845a84c481488c11a9fb5892fc823a9ce66d
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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);

branches/incoming/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)