Skip to content

Commit a6d8415

Browse files
huonwhuonw
committed
---
yaml --- r: 172740 b: refs/heads/try c: 4247a30 h: refs/heads/master v: v3
1 parent 8b84f59 commit a6d8415

Some content is hidden

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

80 files changed

+513
-974
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: 170c4399e614fe599c3d41306b3429ca8b3b68c6
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
5-
refs/heads/try: 9205d74fe0eed9ed1fee4d408e4bc99b7c4e0d58
5+
refs/heads/try: 4247a30bdd73ee3f1c9fa58a4130380a2e47f6ad
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

‎branches/try/RELEASES.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Version 1.0.0-alpha (January 2015)
2222
* Documentation continues to be expanded with more API coverage, more
2323
examples, and more in-depth explanations. The guides have been
2424
consolidated into [The Rust Programming Language][trpl].
25-
* "[Rust By Example][rbe]" is now maintained by the Rust team.
25+
* "Rust By Example" is now maintained by the Rust team.
2626
* All official Rust binary installers now come with [Cargo], the
2727
Rust package manager.
2828

@@ -182,7 +182,6 @@ Version 1.0.0-alpha (January 2015)
182182
[assoc]: https://github.com/rust-lang/rfcs/blob/master/text/0195-associated-items.md
183183
[ints]: https://github.com/rust-lang/rfcs/pull/544#issuecomment-68760871
184184
[trpl]: http://doc.rust-lang.org/book/index.html
185-
[rbe]: http://rustbyexample.com/
186185

187186
Version 0.12.0 (October 2014)
188187
-----------------------------

‎branches/try/mk/cfg/aarch64-apple-ios.mk

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎branches/try/mk/cfg/arm-apple-ios.mk

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# arm-apple-ios configuration
2+
CFG_SDK_NAME_arm-apple-ios = iphoneos
3+
CFG_SDK_ARCHS_arm-apple-ios = armv7
4+
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5+
CFG_IOS_SDK = $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
6+
CFG_IOS_FLAGS = -target armv7-apple-ios -isysroot $(CFG_IOS_SDK) -mios-version-min=7.0
7+
CC_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
8+
CXX_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
9+
CPP_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
10+
AR_arm-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
11+
endif
12+
CFG_LIB_NAME_arm-apple-ios = lib$(1).a
13+
CFG_LIB_GLOB_arm-apple-ios = lib$(1)-*.a
14+
CFG_STATIC_LIB_NAME_arm-apple-ios=lib$(1).a
15+
CFG_LIB_DSYM_GLOB_arm-apple-ios = lib$(1)-*.a.dSYM
16+
CFG_JEMALLOC_CFLAGS_arm-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_FLAGS)
17+
CFG_GCCISH_CFLAGS_arm-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) -mfpu=vfp3 -arch armv7
18+
CFG_GCCISH_CXXFLAGS_arm-apple-ios := -fno-rtti $(CFG_IOS_FLAGS) -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1
19+
CFG_GCCISH_LINK_FLAGS_arm-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK) -Wl,-no_compact_unwind
20+
CFG_GCCISH_DEF_FLAG_arm-apple-ios := -Wl,-exported_symbols_list,
21+
CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-ios :=
22+
CFG_GCCISH_POST_LIB_FLAGS_arm-apple-ios :=
23+
CFG_DEF_SUFFIX_arm-apple-ios := .darwin.def
24+
CFG_LLC_FLAGS_arm-apple-ios := -mattr=+vfp3,+v7,+thumb2,+neon -march=arm
25+
CFG_INSTALL_NAME_arm-apple-ios = -Wl,-install_name,@rpath/$(1)
26+
CFG_EXE_SUFFIX_arm-apple-ios :=
27+
CFG_WINDOWSY_arm-apple-ios :=
28+
CFG_UNIXY_arm-apple-ios := 1
29+
CFG_PATH_MUNGE_arm-apple-ios := true
30+
CFG_LDPATH_arm-apple-ios :=
31+
CFG_RUN_arm-apple-ios = $(2)
32+
CFG_RUN_TARG_arm-apple-ios = $(call CFG_RUN_arm-apple-ios,,$(2))
33+
RUSTC_FLAGS_arm-apple-ios := -C relocation_model=pic
34+
RUSTC_CROSS_FLAGS_arm-apple-ios :=-C relocation_model=pic
35+
CFG_GNU_TRIPLE_arm-apple-ios := arm-apple-ios

‎branches/try/mk/cfg/armv7-apple-ios.mk

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎branches/try/mk/cfg/armv7s-apple-ios.mk

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎branches/try/mk/cfg/i386-apple-ios.mk

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# i386-apple-ios configuration
2-
CFG_SDK_NAME_i386-apple-ios := iphonesimulator
3-
CFG_SDK_ARCHS_i386-apple-ios := i386
2+
CFG_SDK_NAME_i386-apple-ios = iphonesimulator
3+
CFG_SDK_ARCHS_i386-apple-ios = i386
44
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5-
CFG_IOSSIM_SDK_i386-apple-ios := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
6-
CFG_IOSSIM_FLAGS_i386-apple-ios := -m32 -target i386-apple-ios -isysroot $(CFG_IOSSIM_SDK_i386-apple-ios) -mios-simulator-version-min=7.0
5+
CFG_IOSSIM_SDK = $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
6+
CFG_IOSSIM_FLAGS = -target i386-apple-ios -isysroot $(CFG_IOSSIM_SDK) -mios-simulator-version-min=7.0
77
CC_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang)
88
CXX_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
99
CPP_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
@@ -13,21 +13,21 @@ CFG_LIB_NAME_i386-apple-ios = lib$(1).a
1313
CFG_LIB_GLOB_i386-apple-ios = lib$(1)-*.dylib
1414
CFG_STATIC_LIB_NAME_i386-apple-ios=lib$(1).a
1515
CFG_LIB_DSYM_GLOB_i386-apple-ios = lib$(1)-*.dylib.dSYM
16-
CFG_GCCISH_CFLAGS_i386-apple-ios := -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS_i386-apple-ios)
17-
CFG_GCCISH_CXXFLAGS_i386-apple-ios := -fno-rtti $(CFG_IOSSIM_FLAGS_i386-apple-ios) -I$(CFG_IOSSIM_SDK_i386-apple-ios)/usr/include/c++/4.2.1
18-
CFG_GCCISH_LINK_FLAGS_i386-apple-ios := -lpthread -m32 -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK_i386-apple-ios)
19-
CFG_GCCISH_DEF_FLAG_i386-apple-ios := -Wl,-exported_symbols_list,
20-
CFG_GCCISH_PRE_LIB_FLAGS_i386-apple-ios :=
21-
CFG_GCCISH_POST_LIB_FLAGS_i386-apple-ios :=
22-
CFG_DEF_SUFFIX_i386-apple-ios := .darwin.def
16+
CFG_GCCISH_CFLAGS_i386-apple-ios = -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS)
17+
CFG_GCCISH_CXXFLAGS_i386-apple-ios = -fno-rtti $(CFG_IOSSIM_FLAGS) -I$(CFG_IOSSIM_SDK)/usr/include/c++/4.2.1
18+
CFG_GCCISH_LINK_FLAGS_i386-apple-ios = -lpthread -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK)
19+
CFG_GCCISH_DEF_FLAG_i386-apple-ios = -Wl,-exported_symbols_list,
20+
CFG_GCCISH_PRE_LIB_FLAGS_i386-apple-ios =
21+
CFG_GCCISH_POST_LIB_FLAGS_i386-apple-ios =
22+
CFG_DEF_SUFFIX_i386-apple-ios = .darwin.def
2323
CFG_LLC_FLAGS_i386-apple-ios =
2424
CFG_INSTALL_NAME_i386-apple-ios = -Wl,-install_name,@rpath/$(1)
25-
CFG_EXE_SUFFIX_i386-apple-ios :=
26-
CFG_WINDOWSY_i386-apple-ios :=
27-
CFG_UNIXY_i386-apple-ios := 1
28-
CFG_PATH_MUNGE_i386-apple-ios = :true
25+
CFG_EXE_SUFFIX_i386-apple-ios =
26+
CFG_WINDOWSY_i386-apple-ios =
27+
CFG_UNIXY_i386-apple-ios = 1
28+
CFG_PATH_MUNGE_i386-apple-ios = true
2929
CFG_LDPATH_i386-apple-ios =
3030
CFG_RUN_i386-apple-ios = $(2)
3131
CFG_RUN_TARG_i386-apple-ios = $(call CFG_RUN_i386-apple-ios,,$(2))
32-
CFG_JEMALLOC_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS_i386-apple-ios) -target i386-apple-ios #-Wl,-syslibroot $(CFG_IOSSIM_SDK_i386-apple-ios) -Wl,-no_compact_unwind
32+
CFG_JEMALLOC_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS) -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind
3333
CFG_GNU_TRIPLE_i386-apple-ios := i386-apple-ios

‎branches/try/mk/cfg/x86_64-apple-ios.mk

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎branches/try/mk/docs.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ DOCS := index intro tutorial complement-bugreport \
2929
complement-lang-faq complement-design-faq complement-project-faq \
3030
rustdoc reference
3131

32+
# Legacy guides, preserved for a while to reduce the number of 404s
33+
DOCS += guide-crates guide-error-handling guide-ffi guide-macros guide \
34+
guide-ownership guide-plugins guide-pointers guide-strings guide-tasks \
35+
guide-testing
36+
37+
3238
PDF_DOCS := reference
3339

3440
RUSTDOC_DEPS_reference := doc/full-toc.inc

‎branches/try/src/compiler-rt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 58ab642c30d9f97735d5745b5d01781ee199c6ae
1+
Subproject commit 62a4ca6055ad6fda8faf767b93b5736dcdfb7013

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
% The (old) Rust Crates and Modules Guide
2+
3+
This content has moved into the
4+
[the Rust Programming Language book](book/crates-and-modules.html).

‎branches/try/src/doc/guide-error-handling.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
% Error Handling in Rust
2+
3+
This content has moved into the
4+
[the Rust Programming Language book](book/error-handling.html).

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
% The (old) Rust Foreign Function Interface Guide
2+
3+
This content has moved into the
4+
[the Rust Programming Language book](book/ffi.html).

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
% The (old) Rust Macros Guide
2+
3+
This content has moved into the
4+
[the Rust Programming Language book](book/macros.html).

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
% The (old) Rust Ownership Guide
2+
3+
This content has moved into the
4+
[the Rust Programming Language book](book/ownership.html).

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
% The (old) Rust Compiler Plugins Guide
2+
3+
This content has moved into the
4+
[the Rust Programming Language book](book/plugins.html).

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
% The (old) Rust Pointer Guide
2+
3+
This content has moved into the
4+
[the Rust Programming Language book](book/pointers.html).

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
% The (old) Guide to Rust Strings
2+
3+
This content has moved into the
4+
[the Rust Programming Language book](book/strings.html).

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
% The (old) Rust Threads and Communication Guide
2+
3+
This content has moved into the
4+
[the Rust Programming Language book](book/tasks.html).

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
% The (old) Rust Testing Guide
2+
3+
This content has moved into the
4+
[the Rust Programming Language book](book/testing.html).

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
% Writing Safe Low-level and Unsafe Code in Rust
2+
3+
This content has moved into the
4+
[the Rust Programming Language book](book/unsafe.html).

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
% The (old) Rust Guide
2+
3+
This content has moved into the
4+
[the Rust Programming Language book](book/README.html).

‎branches/try/src/doc/trpl/arrays-vectors-and-slices.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% Arrays, Vectors, and Slices
22

33
Like many programming languages, Rust has list types to represent a sequence of
4-
things. The most basic is the *array*, a fixed-size list of elements of the
4+
things. The most basic is the **array**, a fixed-size list of elements of the
55
same type. By default, arrays are immutable.
66

77
```{rust}
@@ -32,7 +32,7 @@ for e in a.iter() {
3232
}
3333
```
3434

35-
You can access a particular element of an array with *subscript notation*:
35+
You can access a particular element of an array with **subscript notation**:
3636

3737
```{rust}
3838
let names = ["Graydon", "Brian", "Niko"]; // names: [&str; 3]
@@ -47,7 +47,7 @@ array, you will get an error: array access is bounds-checked at run-time. Such
4747
errant access is the source of many bugs in other systems programming
4848
languages.
4949

50-
A *vector* is a dynamic or "growable" array, implemented as the standard
50+
A **vector** is a dynamic or "growable" array, implemented as the standard
5151
library type [`Vec<T>`](../std/vec/) (we'll talk about what the `<T>` means
5252
later). Vectors are to arrays what `String` is to `&str`. You can create them
5353
with the `vec!` macro:
@@ -73,7 +73,7 @@ println!("The length of nums is now {}", nums.len()); // Prints 4
7373

7474
Vectors have many more useful methods.
7575

76-
A *slice* is a reference to (or "view" into) an array. They are useful for
76+
A **slice** is a reference to (or "view" into) an array. They are useful for
7777
allowing safe, efficient access to a portion of an array without copying. For
7878
example, you might want to reference just one line of a file read into memory.
7979
By nature, a slice is not created directly, but from an existing variable.

‎branches/try/src/doc/trpl/closures.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
So far, we've made lots of functions in Rust, but we've given them all names.
44
Rust also allows us to create anonymous functions. Rust's anonymous
5-
functions are called *closures*. By themselves, closures aren't all that
5+
functions are called **closure**s. By themselves, closures aren't all that
66
interesting, but when you combine them with functions that take closures as
77
arguments, really powerful things are possible.
88

@@ -61,7 +61,7 @@ fn main() {
6161

6262
## Moving closures
6363

64-
Rust has a second type of closure, called a *moving closure*. Moving
64+
Rust has a second type of closure, called a **moving closure**. Moving
6565
closures are indicated using the `move` keyword (e.g., `move || x *
6666
x`). The difference between a moving closure and an ordinary closure
6767
is that a moving closure always takes ownership of all variables that

‎branches/try/src/doc/trpl/comments.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Now that we have some functions, it's a good idea to learn about comments.
44
Comments are notes that you leave to other programmers to help explain things
55
about your code. The compiler mostly ignores them.
66

7-
Rust has two kinds of comments that you should care about: *line comments*
8-
and *doc comments*.
7+
Rust has two kinds of comments that you should care about: **line comment**s
8+
and **doc comment**s.
99

1010
```{rust}
1111
// Line comments are anything after '//' and extend to the end of the line.

0 commit comments

Comments
 (0)