Skip to content

Commit fd9443a

Browse files
committed
---
yaml --- r: 145342 b: refs/heads/try2 c: 695cb9f h: refs/heads/master v: v3
1 parent 5f67f4e commit fd9443a

39 files changed

+361
-368
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: eabcb39f8d5c634185174461481ec1f39fe07bcb
8+
refs/heads/try2: 695cb9fc2b1bb98a9affac3887806925f962c0aa
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ endif
140140

141141
# version-string calculation
142142
CFG_GIT_DIR := $(CFG_SRC_DIR).git
143-
CFG_RELEASE = 0.8-pre
143+
CFG_RELEASE = 0.8
144144
CFG_VERSION = $(CFG_RELEASE)
145145
# windows exe's need numeric versions - don't use anything but
146146
# numbers and dots here

branches/try2/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/try2/configure

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -845,9 +845,6 @@ 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"
851848

852849
case "$CFG_C_COMPILER" in
853850
("ccache clang")

branches/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<keyword>assert</keyword>
4040
<keyword>break</keyword>
4141
<keyword>const</keyword>
42+
<keyword>copy</keyword>
4243
<keyword>do</keyword>
4344
<keyword>drop</keyword>
4445
<keyword>else</keyword>

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

Lines changed: 2 additions & 1 deletion
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,6 +18,7 @@
1818
<list name="keywords">
1919
<item> as </item>
2020
<item> break </item>
21+
<item> copy </item>
2122
<item> do </item>
2223
<item> drop </item>
2324
<item> else </item>
-2 Bytes
Binary file not shown.

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

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

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

branches/try2/src/libextra/extra.rs

Lines changed: 1 addition & 1 deletion
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

branches/try2/src/librust/rust.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// FIXME #2238 Make run only accept source that emits an executable
1414

1515
#[link(name = "rust",
16-
vers = "0.8-pre",
16+
vers = "0.8",
1717
uuid = "4a24da33-5cc8-4037-9352-2cbe9bd9d27c",
1818
url = "https://github.com/mozilla/rust/tree/master/src/rust")];
1919

branches/try2/src/librustc/front/std_inject.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use syntax::codemap;
1919
use syntax::fold;
2020
use syntax::opt_vec;
2121

22-
static STD_VERSION: &'static str = "0.8-pre";
22+
static STD_VERSION: &'static str = "0.8";
2323

2424
pub fn maybe_inject_libstd_ref(sess: Session, crate: @ast::Crate)
2525
-> @ast::Crate {

branches/try2/src/librustc/front/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ fn mk_std(cx: &TestCtxt) -> ast::view_item {
282282
path_node(~[id_extra]),
283283
ast::DUMMY_NODE_ID))])
284284
} else {
285-
let mi = attr::mk_name_value_item_str(@"vers", @"0.8-pre");
285+
let mi = attr::mk_name_value_item_str(@"vers", @"0.8");
286286
ast::view_item_extern_mod(id_extra, None, ~[mi], ast::DUMMY_NODE_ID)
287287
};
288288
ast::view_item {

branches/try2/src/librustc/rustc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
#[link(name = "rustc",
12-
vers = "0.8-pre",
12+
vers = "0.8",
1313
uuid = "0ce89b41-2f92-459e-bbc1-8f5fe32f16cf",
1414
url = "https://github.com/mozilla/rust/tree/master/src/rustc")];
1515

branches/try2/src/librustdoc/rustdoc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//! Rustdoc - The Rust documentation generator
1212
1313
#[link(name = "rustdoc",
14-
vers = "0.8-pre",
14+
vers = "0.8",
1515
uuid = "f8abd014-b281-484d-a0c3-26e3de8e2412",
1616
url = "https://github.com/mozilla/rust/tree/master/src/rustdoc")];
1717

branches/try2/src/librusti/rusti.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
*/
6060

6161
#[link(name = "rusti",
62-
vers = "0.8-pre",
62+
vers = "0.8",
6363
uuid = "7fb5bf52-7d45-4fee-8325-5ad3311149fc",
6464
url = "https://github.com/mozilla/rust/tree/master/src/rusti")];
6565

branches/try2/src/librustpkg/rustpkg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// rustpkg - a package manager and build system for Rust
1212

1313
#[link(name = "rustpkg",
14-
vers = "0.8-pre",
14+
vers = "0.8",
1515
uuid = "25de5e6e-279e-4a20-845c-4cabae92daaf",
1616
url = "https://github.com/mozilla/rust/tree/master/src/librustpkg")];
1717

0 commit comments

Comments
 (0)