Skip to content

Commit 74d3d2e

Browse files
fhahnfhahn
committed
---
yaml --- r: 104135 b: refs/heads/try c: 195d8fd h: refs/heads/master i: 104133: bde2852 104131: 0caa4a3 104127: 8d833a9 v: v3
1 parent 3d576f6 commit 74d3d2e

File tree

188 files changed

+3779
-5801
lines changed

Some content is hidden

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

188 files changed

+3779
-5801
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
5-
refs/heads/try: c62f6cef6f4bd4bc96ff837ff55aa6604b3902a6
5+
refs/heads/try: 195d8fdc4f7892a4a5755f96c0ca1e993ce74943
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,3 @@
99
[submodule "src/gyp"]
1010
path = src/gyp
1111
url = https://github.com/rust-lang/gyp.git
12-
[submodule "src/compiler-rt"]
13-
path = src/compiler-rt
14-
url = https://github.com/rust-lang/compiler-rt.git

‎branches/try/Makefile.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,7 @@ endif
355355
# Prerequisites for using the stageN compiler to build target artifacts
356356
TSREQ$(1)_T_$(2)_H_$(3) = \
357357
$$(HSREQ$(1)_H_$(3)) \
358-
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a \
359-
$$(TLIB$(1)_T_$(2)_H_$(3))/libcompiler-rt.a
358+
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
360359

361360
# Prerequisites for a working stageN compiler and libraries, for a specific
362361
# target

‎branches/try/mk/clean.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ clean-generic-$(2)-$(1):
5454
$(1)/rt \
5555
$(1)/test \
5656
$(1)/stage* \
57-
-type f \( \
5857
-name '*.[odasS]' -o \
5958
-name '*.so' -o \
6059
-name '*.dylib' -o \
@@ -63,7 +62,6 @@ clean-generic-$(2)-$(1):
6362
-name '*.dll' -o \
6463
-name '*.def' -o \
6564
-name '*.bc' \
66-
\) \
6765
| xargs rm -f
6866
$(Q)find $(1)\
6967
-name '*.dSYM' \
@@ -98,7 +96,6 @@ clean$(1)_T_$(2)_H_$(3): \
9896
$$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
9997
$$(foreach tool,$$(TOOLS),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
10098
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
101-
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libcompiler-rt.a
10299
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/librun_pass_stage* # For unix
103100
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/run_pass_stage* # For windows
104101

‎branches/try/mk/crates.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ HOST_CRATES := syntax rustc rustdoc fourcc
5555
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5656
TOOLS := compiletest rustdoc rustc
5757

58-
DEPS_std := native:rustrt native:compiler-rt
58+
DEPS_std := native:rustrt
5959
DEPS_extra := std term sync serialize getopts collections
6060
DEPS_green := std
6161
DEPS_rustuv := std native:uv native:uv_support

‎branches/try/mk/install.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ install-target-$(1)-host-$(2): \
9696
$$(call INSTALL_LIB,$$(call CFG_LIB_GLOB_$(1),$$(crate)));\
9797
$$(call INSTALL_LIB,$$(call CFG_RLIB_GLOB,$$(crate)));)
9898
$$(Q)$$(call INSTALL_LIB,libmorestack.a)
99-
$$(Q)$$(call INSTALL_LIB,libcompiler-rt.a)
10099

101100
endef
102101

@@ -111,7 +110,6 @@ install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
111110
$$(Q)$$(foreach crate,$$(TARGET_CRATES),\
112111
$$(call INSTALL_LIB,$$(call CFG_RLIB_GLOB,$$(crate)));)
113112
$$(Q)$$(call INSTALL_LIB,libmorestack.a)
114-
$$(Q)$$(call INSTALL_LIB,libcompiler-rt.a)
115113
endef
116114

117115
$(foreach target,$(CFG_TARGET), \

‎branches/try/mk/rt.mk

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -217,37 +217,6 @@ $$(LIBUV_DIR_$(1))/Release/libuv.a: $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)) \
217217

218218
endif
219219

220-
################################################################################
221-
# compiler-rt
222-
################################################################################
223-
224-
ifdef CFG_ENABLE_FAST_MAKE
225-
COMPRT_DEPS := $(S)/.gitmodules
226-
else
227-
COMPRT_DEPS := $(wildcard \
228-
$(S)src/compiler-rt/* \
229-
$(S)src/compiler-rt/*/* \
230-
$(S)src/compiler-rt/*/*/* \
231-
$(S)src/compiler-rt/*/*/*/*)
232-
endif
233-
234-
COMPRT_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),compiler-rt)
235-
COMPRT_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(COMPRT_NAME_$(1))
236-
COMPRT_BUILD_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/compiler-rt
237-
238-
$$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS)
239-
@$$(call E, make: compiler-rt)
240-
$$(Q)$$(MAKE) -C "$(S)src/compiler-rt" \
241-
ProjSrcRoot="$(S)src/compiler-rt" \
242-
ProjObjRoot="$$(abspath $$(COMPRT_BUILD_DIR_$(1)))" \
243-
CC="$$(CC_$(1))" \
244-
AR="$$(AR_$(1))" \
245-
RANLIB="$$(AR_$(1)) s" \
246-
CFLAGS="$$(CFG_GCCISH_CFLAGS_$(1))" \
247-
TargetTriple=$(1) \
248-
triple-runtime
249-
$$(Q)cp $$(COMPRT_BUILD_DIR_$(1))/triple/runtime/libcompiler_rt.a $$(COMPRT_LIB_$(1))
250-
251220
endef
252221

253222
# Instantiate template for all stages/targets

‎branches/try/mk/target.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,6 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/:
138138
$$(TLIB$(1)_T_$(2)_H_$(3))/:
139139
mkdir -p $$@
140140

141-
$$(TLIB$(1)_T_$(2)_H_$(3))/libcompiler-rt.a: \
142-
$$(RT_OUTPUT_DIR_$(2))/$$(call CFG_STATIC_LIB_NAME_$(2),compiler-rt) \
143-
| $$(TLIB$(1)_T_$(2)_H_$(3))/ $$(SNAPSHOT_RUSTC_POST_CLEANUP)
144-
@$$(call E, cp: $$@)
145-
$$(Q)cp $$< $$@
146-
147141
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a: \
148142
$$(RT_OUTPUT_DIR_$(2))/$$(call CFG_STATIC_LIB_NAME_$(2),morestack) \
149143
| $$(TLIB$(1)_T_$(2)_H_$(3))/ $$(SNAPSHOT_RUSTC_POST_CLEANUP)

‎branches/try/mk/tests.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ tidy:
262262
| grep '^$(S)src/gyp' -v \
263263
| grep '^$(S)src/etc' -v \
264264
| grep '^$(S)src/doc' -v \
265-
| grep '^$(S)src/compiler-rt' -v \
266265
| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
267266

268267
endif

‎branches/try/src/compiler-rt

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎branches/try/src/compiletest/header.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ pub fn is_test_ignored(config: &config, testfile: &Path) -> bool {
108108
else if parse_name_directive(ln, ignore_stage(config)) { false }
109109
else if config.mode == common::mode_pretty &&
110110
parse_name_directive(ln, "ignore-pretty") { false }
111-
else if config.target != config.host &&
112-
parse_name_directive(ln, "ignore-cross-compile") { false }
113111
else { true }
114112
});
115113

‎branches/try/src/doc/complement-cheatsheet.md

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -36,42 +36,12 @@ let y: ~str = x.to_str_radix(16);
3636
Use [`FromStrRadix`](http://static.rust-lang.org/doc/master/std/num/trait.FromStrRadix.html), and its helper function, [`from_str_radix`](http://static.rust-lang.org/doc/master/std/num/fn.from_str_radix.html).
3737

3838
~~~
39-
use std::num;
39+
use std::num::from_str_radix;
4040
41-
let x: Option<i64> = num::from_str_radix("deadbeef", 16);
41+
let x: Option<i64> = from_str_radix("deadbeef", 16);
4242
let y: i64 = x.unwrap();
4343
~~~
4444

45-
**Vector of Bytes to String**
46-
47-
To return a Borrowed String Slice (&str) use the str helper function [`from_utf8`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8.html).
48-
49-
~~~
50-
use std::str;
51-
52-
let bytes = ~[104u8,105u8];
53-
let x: Option<&str> = str::from_utf8(bytes);
54-
let y: &str = x.unwrap();
55-
~~~
56-
57-
To return an Owned String (~str) use the str helper function [`from_utf8_owned`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8_owned.html).
58-
59-
~~~
60-
use std::str;
61-
62-
let x: Option<~str> = str::from_utf8_owned(~[104u8,105u8]);
63-
let y: ~str = x.unwrap();
64-
~~~~
65-
66-
To return a [`MaybeOwned`](http://static.rust-lang.org/doc/master/std/str/enum.MaybeOwned.html) use the str helper function [`from_utf8_lossy`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8_owned.html). This function also replaces non-valid utf-8 sequences with U+FFFD replacement character.
67-
68-
~~~
69-
use std::str;
70-
71-
let x = bytes!(72u8,"ello ",0xF0,0x90,0x80,"World!");
72-
let y = str::from_utf8_lossy(x);
73-
~~~~
74-
7545
# File operations
7646

7747
## How do I read from a file?

‎branches/try/src/doc/guide-container.md

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -181,25 +181,19 @@ never call its underlying iterator again once `None` has been returned:
181181
~~~
182182
let xs = [1,2,3,4,5];
183183
let mut calls = 0;
184-
185-
{
186-
let it = xs.iter().scan((), |_, x| {
187-
calls += 1;
188-
if *x < 3 { Some(x) } else { None }});
189-
190-
// the iterator will only yield 1 and 2 before returning None
191-
// If we were to call it 5 times, calls would end up as 5, despite
192-
// only 2 values being yielded (and therefore 3 unique calls being
193-
// made). The fuse() adaptor can fix this.
194-
195-
let mut it = it.fuse();
196-
it.next();
197-
it.next();
198-
it.next();
199-
it.next();
200-
it.next();
201-
}
202-
184+
let it = xs.iter().scan((), |_, x| {
185+
calls += 1;
186+
if *x < 3 { Some(x) } else { None }});
187+
// the iterator will only yield 1 and 2 before returning None
188+
// If we were to call it 5 times, calls would end up as 5, despite only 2 values
189+
// being yielded (and therefore 3 unique calls being made). The fuse() adaptor
190+
// can fix this.
191+
let mut it = it.fuse();
192+
it.next();
193+
it.next();
194+
it.next();
195+
it.next();
196+
it.next();
203197
assert_eq!(calls, 3);
204198
~~~
205199

‎branches/try/src/doc/guide-tasks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ Instead we can use a `SharedChan`, a type that allows a single
232232
~~~
233233
# use std::task::spawn;
234234
235-
let (port, chan) = Chan::new();
235+
let (port, chan) = SharedChan::new();
236236
237237
for init_val in range(0u, 3) {
238238
// Create a new channel handle to distribute to the child task

‎branches/try/src/doc/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ li {list-style-type: none; }
1818
* [Tasks and Communication](guide-tasks.html)
1919
* [Foreign Function Interface](guide-ffi.html)
2020
* [Macros](guide-macros.html)
21+
* [Packaging](guide-rustpkg.html)
2122
* [Testing](guide-testing.html)
2223
* [Conditions](guide-conditions.html)
2324
* [Rust's Runtime](guide-runtime.html)
@@ -31,6 +32,7 @@ li {list-style-type: none; }
3132
* [The 1:1 runtime library, `libnative`](native/index.html)
3233

3334
* [The Rust libuv library, `librustuv`](rustuv/index.html)
35+
* [The Rust packaging library, `librustpkg`](rustpkg/index.html)
3436

3537
* [The Rust parser, `libsyntax`](syntax/index.html)
3638
* [The Rust compiler, `librustc`](rustc/index.html)

0 commit comments

Comments
 (0)