Skip to content

Commit a625f94

Browse files
committed
---
yaml --- r: 46334 b: refs/heads/auto c: a257329 h: refs/heads/master v: v3
1 parent 3bdfebf commit a625f94

File tree

12 files changed

+164
-183
lines changed

12 files changed

+164
-183
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 1f4c758f9b4d92a209bb1a11b11ac937ad76d161
17+
refs/heads/auto: a2573290710f4b3f14be475f4ef2af773de7b4c7

branches/auto/src/librustc/driver/driver.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,17 @@ pub fn default_configuration(sess: Session, +argv0: ~str, input: input) ->
8888

8989
let mk = attr::mk_name_value_item_str;
9090

91-
// ARM is bi-endian, however using NDK seems to default
92-
// to little-endian unless a flag is provided.
93-
let (end,arch,wordsz) = match sess.targ_cfg.arch {
94-
session::arch_x86 => (~"little",~"x86",~"32"),
95-
session::arch_x86_64 => (~"little",~"x86_64",~"64"),
96-
session::arch_arm => (~"little",~"arm",~"32")
91+
let (arch,wordsz) = match sess.targ_cfg.arch {
92+
session::arch_x86 => (~"x86",~"32"),
93+
session::arch_x86_64 => (~"x86_64",~"64"),
94+
session::arch_arm => (~"arm",~"32")
9795
};
9896

9997
return ~[ // Target bindings.
10098
attr::mk_word_item(str::from_slice(os::FAMILY)),
10199
mk(~"target_os", tos),
102100
mk(~"target_family", str::from_slice(os::FAMILY)),
103101
mk(~"target_arch", arch),
104-
mk(~"target_endian", end),
105102
mk(~"target_word_size", wordsz),
106103
mk(~"target_libc", libc),
107104
// Build bindings.

branches/auto/src/librustdoc/text_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ fn apply_to_sections(
7676
op: NominalOp<Op>,
7777
sections: ~[doc::Section]
7878
) -> ~[doc::Section] {
79-
sections.map(|section| doc::Section {
79+
sections.map(|section, copy op| doc::Section {
8080
header: (op.op)(copy section.header),
8181
body: (op.op)(copy section.body)
8282
})
@@ -89,7 +89,7 @@ fn fold_enum(
8989
let fold_copy = copy *fold;
9090

9191
doc::EnumDoc {
92-
variants: do doc.variants.map |variant| {
92+
variants: do doc.variants.map |variant, copy fold_copy| {
9393
doc::VariantDoc {
9494
desc: maybe_apply_op(copy fold_copy.ctxt, &variant.desc),
9595
.. copy *variant

branches/auto/src/librustdoc/tystr_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ fn fold_enum(
137137
variants: do vec::map(doc.variants) |variant| {
138138
let sig = {
139139
let variant = copy *variant;
140-
do astsrv::exec(srv.clone()) |ctxt| {
140+
do astsrv::exec(srv.clone()) |copy variant, ctxt| {
141141
match ctxt.ast_map.get(&doc_id) {
142142
ast_map::node_item(@ast::item {
143143
node: ast::item_enum(ref enum_definition, _), _
@@ -198,7 +198,7 @@ fn get_method_sig(
198198
item_id: doc::AstId,
199199
method_name: ~str
200200
) -> Option<~str> {
201-
do astsrv::exec(srv) |ctxt| {
201+
do astsrv::exec(srv) |copy method_name, ctxt| {
202202
match ctxt.ast_map.get(&item_id) {
203203
ast_map::node_item(@ast::item {
204204
node: ast::item_trait(_, _, ref methods), _

branches/auto/src/librusti/rusti.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ fn run_line(repl: &mut Repl, in: io::Reader, out: io::Writer, line: ~str)
368368
}
369369

370370
let r = *repl;
371-
let result = do task::try {
371+
let result = do task::try |copy r| {
372372
run(r, line)
373373
};
374374

0 commit comments

Comments
 (0)