Skip to content

Commit aa2e817

Browse files
committed
---
yaml --- r: 151103 b: refs/heads/try2 c: e72d49a h: refs/heads/master i: 151101: 3db85a1 151099: 88633ea 151095: 928edfa 151087: 8d612c7 151071: ee60caf 151039: 23747c4 v: v3
1 parent c2d8af8 commit aa2e817

File tree

297 files changed

+5293
-6361
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

297 files changed

+5293
-6361
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: b55394415ab63adf32036f63595f3bba3e1c9098
8+
refs/heads/try2: e72d49a806e26ca901376bcdc395dbf5e8895150
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/platform.mk

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,17 +542,14 @@ ifdef CFG_CCACHE_BASEDIR
542542
export CCACHE_BASEDIR
543543
endif
544544

545-
FIND_COMPILER = $(word 1,$(1:ccache=))
546-
547545
define CFG_MAKE_TOOLCHAIN
548546
# Prepend the tools with their prefix if cross compiling
549547
ifneq ($(CFG_BUILD),$(1))
550548
CC_$(1)=$(CROSS_PREFIX_$(1))$(CC_$(1))
551549
CXX_$(1)=$(CROSS_PREFIX_$(1))$(CXX_$(1))
552550
CPP_$(1)=$(CROSS_PREFIX_$(1))$(CPP_$(1))
553551
AR_$(1)=$(CROSS_PREFIX_$(1))$(AR_$(1))
554-
RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(call FIND_COMPILER,$$(CXX_$(1))) \
555-
-C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1))
552+
RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(CXX_$(1)) -C ar=$$(AR_$(1)) $(RUSTC_CROSS_FLAGS_$(1))
556553

557554
RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))
558555
endif

branches/try2/mk/rt.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ $$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS)
247247
RANLIB="$$(AR_$(1)) s" \
248248
CFLAGS="$$(CFG_GCCISH_CFLAGS_$(1))" \
249249
TargetTriple=$(1) \
250-
triple-builtins
251-
$$(Q)cp $$(COMPRT_BUILD_DIR_$(1))/triple/builtins/libcompiler_rt.a $$(COMPRT_LIB_$(1))
250+
triple-runtime
251+
$$(Q)cp $$(COMPRT_BUILD_DIR_$(1))/triple/runtime/libcompiler_rt.a $$(COMPRT_LIB_$(1))
252252

253253
################################################################################
254254
# libbacktrace

branches/try2/mk/tests.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,8 @@ endif
526526
# triples). The associated message will be printed as a warning
527527
# during attempts to run those tests.
528528

529+
CTEST_DISABLE_NONSELFHOST_rpass-full = "run-pass-full suite is unavailable when cross-compiling."
530+
529531
define DEF_CTEST_VARS
530532

531533
# All the per-stage build rules you might want to call from the
@@ -571,7 +573,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
571573
$$(CTEST_TESTARGS)
572574

573575
CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
574-
CTEST_DEPS_rpass-full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(CSREQ$(1)_T_$(3)_H_$(3)) $$(SREQ$(1)_T_$(2)_H_$(3))
576+
CTEST_DEPS_rpass-full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(CSREQ$(1)_T_$(2)_H_$(3))
575577
CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
576578
CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
577579
CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)

branches/try2/src/compiler-rt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit ed112ca1e4275e1c5707a898f2bf6164707ba378
1+
Subproject commit f4b221571ce6f05714c1f1c6fa48f1393499989c

branches/try2/src/compiletest/compiletest.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,7 @@ pub fn test_opts(config: &config) -> test::TestOpts {
267267
ratchet_metrics: config.ratchet_metrics.clone(),
268268
ratchet_noise_percent: config.ratchet_noise_percent.clone(),
269269
save_metrics: config.save_metrics.clone(),
270-
test_shard: config.test_shard.clone(),
271-
nocapture: false,
270+
test_shard: config.test_shard.clone()
272271
}
273272
}
274273

branches/try2/src/compiletest/runtest.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,6 @@ fn fatal(err: ~str) -> ! { error(err); fail!(); }
955955
fn fatal_ProcRes(err: ~str, proc_res: &ProcRes) -> ! {
956956
print!("\n\
957957
error: {}\n\
958-
status: {}\n\
959958
command: {}\n\
960959
stdout:\n\
961960
------------------------------------------\n\
@@ -966,8 +965,7 @@ stderr:\n\
966965
{}\n\
967966
------------------------------------------\n\
968967
\n",
969-
err, proc_res.status, proc_res.cmdline, proc_res.stdout,
970-
proc_res.stderr);
968+
err, proc_res.cmdline, proc_res.stdout, proc_res.stderr);
971969
fail!();
972970
}
973971

branches/try2/src/doc/full-toc.inc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<style>
22
/* Display the full TOC */
3-
nav {
4-
column-count: auto;
5-
-moz-column-count: auto;
6-
-webkit-column-count: auto;
7-
}
8-
nav ul ul {
3+
#TOC ul ul {
94
display: block;
105
padding-left: 2em;
116
}

branches/try2/src/doc/guide-lifetimes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ it. It would violate memory safety for the box that was originally
236236
assigned to `x` to be garbage-collected, since a non-heap
237237
pointer *`y`* still points into it.
238238

239-
> *Note:* Our current implementation implements the garbage collector
239+
> ***Note:*** Our current implementation implements the garbage collector
240240
> using reference counting and cycle detection.
241241
242242
For this reason, whenever an `&` expression borrows the interior of a
@@ -674,7 +674,7 @@ Named lifetime notation can also be used to control the flow of execution:
674674
}
675675
~~~
676676

677-
> *Note:* Labelled breaks are not currently supported within `while` loops.
677+
> ***Note:*** Labelled breaks are not currently supported within `while` loops.
678678
679679
Named labels are hygienic and can be used safely within macros.
680680
See the macros guide section on hygiene for more details.

branches/try2/src/doc/guide-tasks.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ be distributed on the available cores.
306306
fn partial_sum(start: uint) -> f64 {
307307
let mut local_sum = 0f64;
308308
for num in range(start*100000, (start+1)*100000) {
309-
local_sum += (num as f64 + 1.0).powf(-2.0);
309+
local_sum += (num as f64 + 1.0).powf(&-2.0);
310310
}
311311
local_sum
312312
}
@@ -343,7 +343,7 @@ extern crate sync;
343343
use sync::Arc;
344344
345345
fn pnorm(nums: &[f64], p: uint) -> f64 {
346-
nums.iter().fold(0.0, |a, b| a + b.powf(p as f64)).powf(1.0 / (p as f64))
346+
nums.iter().fold(0.0, |a,b| a+(*b).powf(&(p as f64)) ).powf(&(1.0 / (p as f64)))
347347
}
348348
349349
fn main() {
@@ -456,7 +456,7 @@ an `Error` result.
456456

457457
[`Result`]: std/result/index.html
458458

459-
> *Note:* A failed task does not currently produce a useful error
459+
> ***Note:*** A failed task does not currently produce a useful error
460460
> value (`try` always returns `Err(())`). In the
461461
> future, it may be possible for tasks to intercept the value passed to
462462
> `fail!()`.

branches/try2/src/doc/po/ja/tutorial.md.po

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,11 @@ msgstr ""
196196
#. type: Plain text
197197
#: src/doc/tutorial.md:57
198198
msgid ""
199-
"> *Warning:* Rust is a language under ongoing development. Notes > about "
199+
"> ***Warning:*** Rust is a language under ongoing development. Notes > about "
200200
"potential changes to the language, implementation > deficiencies, and other "
201201
"caveats appear offset in blockquotes."
202202
msgstr ""
203-
"> *警告:* Rust は開発途上の言語です。将来予定されている言語への変更や、実"
203+
"> ***警告:*** Rust は開発途上の言語です。将来予定されている言語への変更や、実"
204204
"装上の不備、その他の注意事項など、 blockquote の段落 (この段落もそうです) に"
205205
"注意してください。"
206206

@@ -287,13 +287,13 @@ msgstr ""
287287
#. type: Plain text
288288
#: src/doc/tutorial.md:88
289289
msgid ""
290-
"> *Note:* Windows users should read the detailed > \"[getting started]"
290+
"> ***Note:*** Windows users should read the detailed > \"[getting started]"
291291
"[wiki-start]\" notes on the wiki. Even when using > the binary installer, "
292292
"the Windows build requires a MinGW installation, > the precise details of "
293293
"which are not discussed here. Finally, `rustc` may > need to be [referred to "
294294
"as `rustc.exe`][bug-3319]. It's a bummer, we > know."
295295
msgstr ""
296-
"> *注意:* Windows ユーザーは wiki の [getting started][wiki-start] の記事"
296+
"> ***注意:*** Windows ユーザーは wiki の [getting started][wiki-start] の記事"
297297
"を読んでください。 本書では詳細を説明しませんが、インストーラを利用する場合で"
298298
"も、MinGW のインストールなど、追加の手順が必要です。また、コンパイラは "
299299
"`rustc` ではなく、 [`rustc.exe` として呼び出す必要がある][bug-3319] かもしれ"
@@ -1254,11 +1254,11 @@ msgstr ""
12541254
#. type: Plain text
12551255
#: src/doc/tutorial.md:504
12561256
msgid ""
1257-
"> *Note:* The following code makes use of tuples (`(f64, f64)`) which > "
1257+
"> ***Note:*** The following code makes use of tuples (`(f64, f64)`) which > "
12581258
"are explained in section 5.3. For now you can think of tuples as a list of > "
12591259
"items."
12601260
msgstr ""
1261-
"> *注意:* 以下のコード例では5.3 節で説明されるタプル (`(f64, f64)`) を"
1261+
"> ***注意:*** 以下のコード例では5.3 節で説明されるタプル (`(f64, f64)`) を"
12621262
"使っています。現時点では、タプルは項目のリストのようなものだとみなしてくださ"
12631263
"い。"
12641264

@@ -3005,11 +3005,11 @@ msgstr ""
30053005
#. type: Plain text
30063006
#: src/doc/tutorial.md:1774
30073007
msgid ""
3008-
"> *Note:* Both the syntax and the semantics will be changing > in small "
3008+
"> ***Note:*** Both the syntax and the semantics will be changing > in small "
30093009
"ways. At the moment they can be unsound in some > scenarios, particularly "
30103010
"with non-copyable types."
30113011
msgstr ""
3012-
"> *注意* コードの文法と意味は将来的に変更されるかもしれません。現時点では"
3012+
"> ***注意*** コードの文法と意味は将来的に変更されるかもしれません。現時点では"
30133013
"いくつかの状況、特にコピーできない型が関連するケースにおいて望ましくない振る"
30143014
"舞いが起こされる場合があります。"
30153015

@@ -3660,10 +3660,10 @@ msgstr ""
36603660
#. type: Plain text
36613661
#: src/doc/tutorial.md:2099
36623662
msgid ""
3663-
"> *Note:* These two traits were referred to as 'kinds' in earlier > "
3663+
"> ***Note:*** These two traits were referred to as 'kinds' in earlier > "
36643664
"iterations of the language, and often still are."
36653665
msgstr ""
3666-
"> *注意* これら2つのトレイトは、以前は 「種」 (kind) と呼ばれており、現在"
3666+
"> ***注意*** これら2つのトレイトは、以前は 「種」 (kind) と呼ばれており、現在"
36673667
"でもそう呼ばれる場合があります。"
36683668

36693669
#. type: Plain text
@@ -4374,9 +4374,9 @@ msgstr ""
43744374

43754375
#. type: Plain text
43764376
#: src/doc/tutorial.md:2511
4377-
msgid "> *Note:* Trait inheritance does not actually work with objects yet"
4377+
msgid "> ***Note:*** Trait inheritance does not actually work with objects yet"
43784378
msgstr ""
4379-
"> *注意* トレイトの継承は、実際にはまだオブジェクトに対しては動作しませ"
4379+
"> ***注意*** トレイトの継承は、実際にはまだオブジェクトに対しては動作しませ"
43804380
"ん。"
43814381

43824382
#. type: Plain text

0 commit comments

Comments
 (0)