Skip to content

Commit 55a59e5

Browse files
committed
---
yaml --- r: 83326 b: refs/heads/try c: 11a8b3d h: refs/heads/master v: v3
1 parent 303757d commit 55a59e5

Some content is hidden

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

71 files changed

+702
-1837
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: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
5-
refs/heads/try: 0442764a9ba46659441b5880556b96b2a1c77010
5+
refs/heads/try: 11a8b3d028496878155f1ae6925fd84411b99dd6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/Makefile.in

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,12 @@ else
100100
CFG_RUSTC_FLAGS += -O --cfg rtopt
101101
endif
102102

103-
ifdef CFG_DISABLE_DEBUG
104-
CFG_RUSTC_FLAGS += --cfg ndebug
105-
CFG_GCCISH_CFLAGS += -DRUST_NDEBUG
106-
else
103+
ifdef CFG_ENABLE_DEBUG
107104
$(info cfg: enabling more debugging (CFG_ENABLE_DEBUG))
108-
CFG_RUSTC_FLAGS += --cfg debug
109105
CFG_GCCISH_CFLAGS += -DRUST_DEBUG
106+
else
107+
CFG_RUSTC_FLAGS += --cfg ndebug
108+
CFG_GCCISH_CFLAGS += -DRUST_NDEBUG
110109
endif
111110

112111
ifdef SAVE_TEMPS
@@ -141,7 +140,7 @@ endif
141140

142141
# version-string calculation
143142
CFG_GIT_DIR := $(CFG_SRC_DIR).git
144-
CFG_RELEASE = 0.8-pre
143+
CFG_RELEASE = 0.8
145144
CFG_VERSION = $(CFG_RELEASE)
146145
# windows exe's need numeric versions - don't use anything but
147146
# numbers and dots here

branches/try/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ documentation.
1818
1919
[tutorial]: http://static.rust-lang.org/doc/tutorial.html
2020
[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
21-
[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
21+
[win-exe]: http://static.rust-lang.org/dist/rust-0.8-install.exe
2222

2323
### Linux / OS X
2424

@@ -33,9 +33,9 @@ documentation.
3333

3434
To build from the [tarball] do:
3535

36-
$ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz
37-
$ tar -xzf rust-0.7.tar.gz
38-
$ cd rust-0.7
36+
$ curl -O http://static.rust-lang.org/dist/rust-0.8.tar.gz
37+
$ tar -xzf rust-0.8.tar.gz
38+
$ cd rust-0.8
3939

4040
Or to build from the [repo] do:
4141

@@ -60,8 +60,8 @@ documentation.
6060
4. Enjoy!
6161

6262
[repo]: https://github.com/mozilla/rust
63-
[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
64-
[tutorial]: http://static.rust-lang.org/doc/0.7/tutorial.html
63+
[tarball]: http://static.rust-lang.org/dist/rust-0.8.tar.gz
64+
[tutorial]: http://static.rust-lang.org/doc/0.8/tutorial.html
6565

6666
## Notes
6767

branches/try/configure

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,9 @@ do
845845

846846
# Disable unused LLVM features
847847
LLVM_OPTS="$LLVM_DBG_OPTS $LLVM_ASSERTION_OPTS --disable-docs --enable-bindings=none"
848+
# Disable term-info, linkage of which comes in multiple forms,
849+
# making our snapshots incompatible (#9334)
850+
LLVM_OPTS="$LLVM_OPTS --disable-terminfo"
848851

849852
case "$CFG_C_COMPILER" in
850853
("ccache clang")

branches/try/doc/po/ja/rust.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-08-12 02:06+0900\n"
1010
"PO-Revision-Date: 2013-08-05 19:40+0900\n"
1111
"Last-Translator: Automatically generated\n"

branches/try/doc/po/ja/rustpkg.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-07-30 07:07+0900\n"
1010
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
1111
"Last-Translator: Automatically generated\n"

branches/try/doc/po/ja/tutorial-borrowed-ptr.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-07-22 23:37+0900\n"
1010
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
1111
"Last-Translator: Automatically generated\n"

branches/try/doc/po/ja/tutorial-container.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-08-05 19:40+0900\n"
1010
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
1111
"Last-Translator: Automatically generated\n"

branches/try/doc/po/ja/tutorial-ffi.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-08-10 07:44+0900\n"
1010
"PO-Revision-Date: 2013-07-22 23:37+0900\n"
1111
"Last-Translator: Automatically generated\n"

branches/try/doc/po/ja/tutorial-macros.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-07-28 20:32+0900\n"
1010
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
1111
"Last-Translator: Automatically generated\n"

branches/try/doc/po/ja/tutorial-tasks.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-08-08 22:27+0900\n"
1010
"PO-Revision-Date: 2013-07-28 20:32+0900\n"
1111
"Last-Translator: Automatically generated\n"

branches/try/doc/po/ja/tutorial.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.8-pre\n"
8+
"Project-Id-Version: Rust 0.8\n"
99
"POT-Creation-Date: 2013-08-12 02:06+0900\n"
1010
"PO-Revision-Date: 2013-08-08 22:27+0900\n"
1111
"Last-Translator: Automatically generated\n"

branches/try/doc/po/rust.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-08-12 02:06+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

branches/try/doc/po/rustpkg.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-07-30 07:07+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

branches/try/doc/po/tutorial-borrowed-ptr.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-07-22 23:37+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

branches/try/doc/po/tutorial-container.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-08-05 19:40+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

branches/try/doc/po/tutorial-ffi.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-08-10 07:44+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

branches/try/doc/po/tutorial-macros.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-07-22 23:37+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

branches/try/doc/po/tutorial-tasks.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-08-08 22:27+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

branches/try/doc/po/tutorial.md.pot

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Rust 0.8-pre\n"
9+
"Project-Id-Version: Rust 0.8\n"
1010
"POT-Creation-Date: 2013-08-12 02:06+0900\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -271,8 +271,8 @@ msgstr ""
271271
#. type: Plain text
272272
#: doc/tutorial.md:108
273273
msgid ""
274-
"~~~~ {.notrust} $ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz $ "
275-
"tar -xzf rust-0.7.tar.gz $ cd rust-0.7 $ ./configure $ make && make install "
274+
"~~~~ {.notrust} $ curl -O http://static.rust-lang.org/dist/rust-0.8.tar.gz $ "
275+
"tar -xzf rust-0.8.tar.gz $ cd rust-0.8 $ ./configure $ make && make install "
276276
"~~~~"
277277
msgstr ""
278278

@@ -298,8 +298,8 @@ msgstr ""
298298
#. type: Plain text
299299
#: doc/tutorial.md:123
300300
msgid ""
301-
"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
302-
"http://static.rust-lang.org/dist/rust-0.7-install.exe"
301+
"[tarball]: http://static.rust-lang.org/dist/rust-0.8.tar.gz [win-exe]: "
302+
"http://static.rust-lang.org/dist/rust-0.8-install.exe"
303303
msgstr ""
304304

305305
#. type: Plain text

branches/try/doc/tutorial.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ If you've fulfilled those prerequisites, something along these lines
9898
should work.
9999

100100
~~~~ {.notrust}
101-
$ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz
102-
$ tar -xzf rust-0.7.tar.gz
103-
$ cd rust-0.7
101+
$ curl -O http://static.rust-lang.org/dist/rust-0.8.tar.gz
102+
$ tar -xzf rust-0.8.tar.gz
103+
$ cd rust-0.8
104104
$ ./configure
105105
$ make && make install
106106
~~~~
@@ -117,8 +117,8 @@ API-documentation tool; `rustpkg`, the Rust package manager;
117117
`rusti`, the Rust REPL; and `rust`, a tool which acts both as a unified
118118
interface for them, and for a few common command line scenarios.
119119

120-
[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
121-
[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
120+
[tarball]: http://static.rust-lang.org/dist/rust-0.8.tar.gz
121+
[win-exe]: http://static.rust-lang.org/dist/rust-0.8-install.exe
122122

123123
## Compiling your first program
124124

branches/try/mk/docs.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,12 +231,12 @@ doc/$(1)/rust.css: rust.css
231231
DOCS += doc/$(1)/index.html
232232
endef
233233

234-
# The library documenting macro
235-
# $(1) - The output directory
234+
# The "next generation" library documenting macro
235+
# $(1) - The crate name (std/extra)
236236
# $(2) - The crate file
237-
# $(3) - The crate soruce files
237+
# $(3) - The relevant host build triple (to depend on libstd)
238238
define libdocng
239-
doc/ng/$(1)/index.html: $(2) $(3) $$(RUSTDOC_NG)
239+
doc/ng/$(1)/index.html: $$(RUSTDOC_NG) $$(TLIB2_T_$(3)_H_$(3))/$(CFG_STDLIB_$(3))
240240
@$$(call E, rustdoc_ng: $$@)
241241
$(Q)$(RUSTDOC_NG) html $(2) -o doc/ng
242242

@@ -245,8 +245,8 @@ endef
245245

246246
$(eval $(call libdoc,std,$(STDLIB_CRATE),$(STDLIB_INPUTS)))
247247
$(eval $(call libdoc,extra,$(EXTRALIB_CRATE),$(EXTRALIB_INPUTS)))
248-
$(eval $(call libdocng,std,$(STDLIB_CRATE),$(STDLIB_INPUTS)))
249-
$(eval $(call libdocng,extra,$(EXTRALIB_CRATE),$(EXTRALIB_INPUTS)))
248+
$(eval $(call libdocng,std,$(STDLIB_CRATE),$(CFG_BUILD_TRIPLE)))
249+
$(eval $(call libdocng,extra,$(EXTRALIB_CRATE),$(CFG_BUILD_TRIPLE)))
250250
endif
251251

252252

branches/try/mk/rt.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ RUNTIME_CXXS_$(1)_$(2) := \
7474
rt/rust_rng.cpp \
7575
rt/rust_upcall.cpp \
7676
rt/rust_uv.cpp \
77-
rt/isaac/randport.cpp \
7877
rt/miniz.cpp \
7978
rt/memory_region.cpp \
8079
rt/boxed_region.cpp \

branches/try/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<keyword>assert</keyword>
4040
<keyword>break</keyword>
4141
<keyword>const</keyword>
42-
<keyword>copy</keyword>
4342
<keyword>do</keyword>
4443
<keyword>drop</keyword>
4544
<keyword>else</keyword>

branches/try/src/etc/kate/rust.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
88
<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
99
]>
10-
<language name="Rust" version="0.8-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
10+
<language name="Rust" version="0.8" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
1111
<highlighting>
1212
<list name="fn">
1313
<item> fn </item>
@@ -18,7 +18,6 @@
1818
<list name="keywords">
1919
<item> as </item>
2020
<item> break </item>
21-
<item> copy </item>
2221
<item> do </item>
2322
<item> drop </item>
2423
<item> else </item>
-2 Bytes
Binary file not shown.

branches/try/src/etc/vim/syntax/rust.vim

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ syn keyword rustOperator as
1818

1919
syn match rustAssert "\<assert\(\w\)*!" contained
2020
syn match rustFail "\<fail\(\w\)*!" contained
21-
syn keyword rustKeyword break copy do extern
21+
syn keyword rustKeyword break do extern
2222
syn keyword rustKeyword in if impl let log
23-
syn keyword rustKeyword copy do extern
2423
syn keyword rustKeyword for impl let log
2524
syn keyword rustKeyword loop mod once priv pub
2625
syn keyword rustKeyword return

branches/try/src/libextra/base64.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,11 +311,11 @@ mod test {
311311
312312
#[test]
313313
fn test_base64_random() {
314-
use std::rand::{task_rng, random, RngUtil};
314+
use std::rand::{task_rng, random, Rng};
315315
use std::vec;
316316
317317
do 1000.times {
318-
let times = task_rng().gen_uint_range(1, 100);
318+
let times = task_rng().gen_integer_range(1u, 100);
319319
let v = vec::from_fn(times, |_| random::<u8>());
320320
assert_eq!(v.to_base64(STANDARD).from_base64().unwrap(), v);
321321
}

branches/try/src/libextra/container.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub trait Deque<T> : Mutable {
4343
mod bench {
4444
use std::container::MutableMap;
4545
use std::{vec, rand};
46-
use std::rand::RngUtil;
46+
use std::rand::Rng;
4747
use test::BenchHarness;
4848

4949
pub fn insert_rand_n<M:MutableMap<uint,uint>>(n: uint,

branches/try/src/libextra/crypto/cryptoutil.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,7 @@ impl <T: FixedBuffer> StandardPadding for T {
347347

348348
#[cfg(test)]
349349
mod test {
350-
use std::rand::IsaacRng;
351-
use std::rand::RngUtil;
350+
use std::rand::{IsaacRng, Rng};
352351
use std::vec;
353352

354353
use cryptoutil::{add_bytes_to_bits, add_bytes_to_bits_tuple};
@@ -365,7 +364,7 @@ mod test {
365364
digest.reset();
366365

367366
while count < total_size {
368-
let next: uint = rng.gen_uint_range(0, 2 * blocksize + 1);
367+
let next: uint = rng.gen_integer_range(0, 2 * blocksize + 1);
369368
let remaining = total_size - count;
370369
let size = if next > remaining { remaining } else { next };
371370
digest.input(buffer.slice_to(size));

branches/try/src/libextra/extra.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Rust extras are part of the standard Rust distribution.
2121
*/
2222

2323
#[link(name = "extra",
24-
vers = "0.8-pre",
24+
vers = "0.8",
2525
uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
2626
url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
2727

@@ -93,7 +93,6 @@ pub mod glob;
9393
pub mod term;
9494
pub mod time;
9595
pub mod arena;
96-
pub mod par;
9796
pub mod base64;
9897
pub mod rl;
9998
pub mod workcache;

0 commit comments

Comments
 (0)