Skip to content

Commit 872d2dd

Browse files
sanxiyncatamorphism
authored andcommitted
---
yaml --- r: 52444 b: refs/heads/dist-snap c: 9a5d617 h: refs/heads/master v: v3
1 parent e397908 commit 872d2dd

File tree

8 files changed

+14
-3
lines changed

8 files changed

+14
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
10-
refs/heads/dist-snap: dfa97c21a57f10ff1f904a81a13ad8406e8224cb
10+
refs/heads/dist-snap: 9a5d6170927547226870bbf4eb9cad62cdc405f6
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/trans/base.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,6 +1845,7 @@ fn trans_enum_variant(ccx: @crate_ctxt,
18451845
let fn_args = do args.map |varg| {
18461846
ast::arg {
18471847
mode: ast::expl(ast::by_copy),
1848+
is_mutbl: false,
18481849
ty: varg.ty,
18491850
pat: ast_util::ident_to_pat(
18501851
ccx.tcx.sess.next_node_id(),
@@ -1908,6 +1909,7 @@ fn trans_tuple_struct(ccx: @crate_ctxt,
19081909
let fn_args = do fields.map |field| {
19091910
ast::arg {
19101911
mode: ast::expl(ast::by_copy),
1912+
is_mutbl: false,
19111913
ty: field.node.ty,
19121914
pat: ast_util::ident_to_pat(ccx.tcx.sess.next_node_id(),
19131915
ast_util::dummy_sp(),

branches/dist-snap/src/libsyntax/ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,11 +1194,11 @@ impl Ty : to_bytes::IterBytes {
11941194
}
11951195
}
11961196

1197-
11981197
#[auto_encode]
11991198
#[auto_decode]
12001199
struct arg {
12011200
mode: mode,
1201+
is_mutbl: bool,
12021202
ty: @Ty,
12031203
pat: @pat,
12041204
id: node_id,

branches/dist-snap/src/libsyntax/ext/auto_encode.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,7 @@ fn mk_ser_method(
595595

596596
let ser_inputs = ~[ast::arg {
597597
mode: ast::infer(cx.next_id()),
598+
is_mutbl: false,
598599
ty: ty_s,
599600
pat: @ast::pat {
600601
id: cx.next_id(),
@@ -658,6 +659,7 @@ fn mk_deser_method(
658659

659660
let deser_inputs = ~[ast::arg {
660661
mode: ast::infer(cx.next_id()),
662+
is_mutbl: false,
661663
ty: ty_d,
662664
pat: @ast::pat {
663665
id: cx.next_id(),
@@ -1194,6 +1196,7 @@ fn mk_enum_deser_body(
11941196
ast::fn_decl {
11951197
inputs: ~[ast::arg {
11961198
mode: ast::infer(cx.next_id()),
1199+
is_mutbl: false,
11971200
ty: @ast::Ty {
11981201
id: cx.next_id(),
11991202
node: ast::ty_infer,

branches/dist-snap/src/libsyntax/ext/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ fn mk_arg(cx: ext_ctxt,
319319
let arg_pat = mk_pat_ident(cx, span, ident);
320320
ast::arg {
321321
mode: ast::infer(cx.next_id()),
322+
is_mutbl: false,
322323
ty: ty,
323324
pat: arg_pat,
324325
id: cx.next_id()

branches/dist-snap/src/libsyntax/ext/pipes/ast_builder.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ impl ext_ctxt: ext_ctxt_ast_builder {
200200
fn arg(name: ident, ty: @ast::Ty) -> ast::arg {
201201
ast::arg {
202202
mode: ast::infer(self.next_id()),
203+
is_mutbl: false,
203204
ty: ty,
204205
pat: @ast::pat {
205206
id: self.next_id(),

branches/dist-snap/src/libsyntax/fold.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ fn fold_attribute_(at: attribute, fld: ast_fold) -> attribute {
127127
fn fold_arg_(a: arg, fld: ast_fold) -> arg {
128128
ast::arg {
129129
mode: a.mode,
130+
is_mutbl: a.is_mutbl,
130131
ty: fld.fold_ty(a.ty),
131132
pat: fld.fold_pat(a.pat),
132133
id: fld.new_id(a.id),

branches/dist-snap/src/libsyntax/parse/parser.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,6 +716,7 @@ impl Parser {
716716
// identifier names.
717717
fn parse_arg_general(require_name: bool) -> arg {
718718
let mut m;
719+
let is_mutbl = false;
719720
let pat = if require_name || self.is_named_argument() {
720721
m = self.parse_arg_mode();
721722
let pat = self.parse_pat(false);
@@ -730,7 +731,8 @@ impl Parser {
730731
731732
let t = self.parse_ty(false);
732733
733-
ast::arg { mode: m, ty: t, pat: pat, id: self.get_id() }
734+
ast::arg { mode: m, is_mutbl: is_mutbl,
735+
ty: t, pat: pat, id: self.get_id() }
734736
}
735737
736738
fn parse_arg() -> arg_or_capture_item {
@@ -756,6 +758,7 @@ impl Parser {
756758
};
757759
either::Left(ast::arg {
758760
mode: m,
761+
is_mutbl: false,
759762
ty: t,
760763
pat: pat,
761764
id: p.get_id()

0 commit comments

Comments
 (0)