Skip to content

Commit a68382d

Browse files
poirupoiru
committed
---
yaml --- r: 81007 b: refs/heads/snap-stage3 c: 2ab278f h: refs/heads/master i: 81005: e1032b1 81003: 2730fb6 80999: b11ba01 80991: 26746e2 v: v3
1 parent 9708965 commit a68382d

36 files changed

+62
-52
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 07167826d6b7b30c96cc9d6227fbe01b65e980f8
4+
refs/heads/snap-stage3: 2ab278f130cb206ce9117145ddefbbb650ba8c68
55
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/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
143+
CFG_RELEASE = 0.8-pre
144144
CFG_VERSION = $(CFG_RELEASE)
145145
# windows exe's need numeric versions - don't use anything but
146146
# numbers and dots here

‎branches/snap-stage3/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.8-install.exe
21+
[win-exe]: http://static.rust-lang.org/dist/rust-0.7-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.8.tar.gz
37-
$ tar -xzf rust-0.8.tar.gz
38-
$ cd rust-0.8
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
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.8.tar.gz
64-
[tutorial]: http://static.rust-lang.org/doc/0.8/tutorial.html
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
6565

6666
## Notes
6767

‎branches/snap-stage3/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\n"
8+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
8+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
8+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
8+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
8+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
8+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
8+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
8+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
9+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
9+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
9+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
9+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
9+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
9+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
9+
"Project-Id-Version: Rust 0.8-pre\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/snap-stage3/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\n"
9+
"Project-Id-Version: Rust 0.8-pre\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.8.tar.gz $ "
275-
"tar -xzf rust-0.8.tar.gz $ cd rust-0.8 $ ./configure $ make && make install "
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 "
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.8.tar.gz [win-exe]: "
302-
"http://static.rust-lang.org/dist/rust-0.8-install.exe"
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"
303303
msgstr ""
304304

305305
#. type: Plain text

‎branches/snap-stage3/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.8.tar.gz
102-
$ tar -xzf rust-0.8.tar.gz
103-
$ cd rust-0.8
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
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.8.tar.gz
121-
[win-exe]: http://static.rust-lang.org/dist/rust-0.8-install.exe
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
122122

123123
## Compiling your first program
124124

‎branches/snap-stage3/src/etc/kate/rust.xml

Lines changed: 1 addition & 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" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
10+
<language name="Rust" version="0.8-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
1111
<highlighting>
1212
<list name="fn">
1313
<item> fn </item>

‎branches/snap-stage3/src/etc/pkg/rust-logo.ico

2 Bytes
Binary file not shown.

‎branches/snap-stage3/src/etc/vim/syntax/rust.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ syn match rustIdentifier contains=rustIdentifierPrime "\%([^[:cntrl:][:spac
3434
syn match rustFuncName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
3535

3636
" Reserved (but not yet used) keywords {{{2
37-
syn keyword rustKeyword be yield typeof
37+
syn keyword rustKeyword alignof be offsetof pure sizeof typeof yield
3838

3939
" Built-in types {{{2
4040
syn keyword rustType int uint float char bool u8 u16 u32 u64 f32

‎branches/snap-stage3/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",
24+
vers = "0.8-pre",
2525
uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
2626
url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
2727

‎branches/snap-stage3/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",
16+
vers = "0.8-pre",
1717
uuid = "4a24da33-5cc8-4037-9352-2cbe9bd9d27c",
1818
url = "https://github.com/mozilla/rust/tree/master/src/rust")];
1919

‎branches/snap-stage3/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";
22+
static STD_VERSION: &'static str = "0.8-pre";
2323

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

‎branches/snap-stage3/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");
285+
let mi = attr::mk_name_value_item_str(@"vers", @"0.8-pre");
286286
ast::view_item_extern_mod(id_extra, None, ~[mi], ast::DUMMY_NODE_ID)
287287
};
288288
ast::view_item {

‎branches/snap-stage3/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",
12+
vers = "0.8-pre",
1313
uuid = "0ce89b41-2f92-459e-bbc1-8f5fe32f16cf",
1414
url = "https://github.com/mozilla/rust/tree/master/src/rustc")];
1515

‎branches/snap-stage3/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",
14+
vers = "0.8-pre",
1515
uuid = "f8abd014-b281-484d-a0c3-26e3de8e2412",
1616
url = "https://github.com/mozilla/rust/tree/master/src/rustdoc")];
1717

‎branches/snap-stage3/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",
62+
vers = "0.8-pre",
6363
uuid = "7fb5bf52-7d45-4fee-8325-5ad3311149fc",
6464
url = "https://github.com/mozilla/rust/tree/master/src/rusti")];
6565

‎branches/snap-stage3/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",
14+
vers = "0.8-pre",
1515
uuid = "25de5e6e-279e-4a20-845c-4cabae92daaf",
1616
url = "https://github.com/mozilla/rust/tree/master/src/librustpkg")];
1717

‎branches/snap-stage3/src/libstd/std.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ they contained the following prologue:
4949

5050

5151
#[link(name = "std",
52-
vers = "0.8",
52+
vers = "0.8-pre",
5353
uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
5454
url = "https://github.com/mozilla/rust/tree/master/src/libstd")];
5555

@@ -68,7 +68,7 @@ they contained the following prologue:
6868
#[deny(missing_doc)];
6969

7070
// Make extra accessible for benchmarking
71-
#[cfg(test)] extern mod extra(vers="0.8");
71+
#[cfg(test)] extern mod extra(vers="0.8-pre");
7272

7373
// Make std testable by not duplicating lang items. See #2912
7474
#[cfg(test)] extern mod realstd(name = "std");

0 commit comments

Comments
 (0)