Skip to content

Commit 045eaf1

Browse files
borsbors
committed
---
yaml --- r: 172794 b: refs/heads/try c: 8e0bb03 h: refs/heads/master v: v3
1 parent dff313c commit 045eaf1

File tree

133 files changed

+1733
-687
lines changed

Some content is hidden

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

133 files changed

+1733
-687
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: d4b70fe6c683a8a292353b60bdce40ecfe9f5962
5+
refs/heads/try: 8e0bb03841e5dd9d972b9e7aef0ea5b07409a30e
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: 2 additions & 1 deletion
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" is now maintained by the Rust team.
25+
* "[Rust By Example][rbe]" is now maintained by the Rust team.
2626
* All official Rust binary installers now come with [Cargo], the
2727
Rust package manager.
2828

@@ -182,6 +182,7 @@ 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/
185186

186187
Version 0.12.0 (October 2014)
187188
-----------------------------

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# aarch64-apple-ios configuration
2+
CFG_SDK_NAME_aarch64-apple-ios := iphoneos
3+
CFG_SDK_ARCHS_aarch64-apple-ios := arm64
4+
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5+
CFG_IOS_SDK_aarch64-apple-ios := $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
6+
CFG_IOS_SDK_FLAGS_aarch64-apple-ios := -target aarch64-apple-darwin -isysroot $(CFG_IOS_SDK_aarch64-apple-ios) -mios-version-min=7.0 -arch arm64
7+
CC_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
8+
CXX_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
9+
CPP_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
10+
AR_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
11+
endif
12+
CFG_LIB_NAME_aarch64-apple-ios = lib$(1).a
13+
CFG_LIB_GLOB_aarch64-apple-ios = lib$(1)-*.a
14+
CFG_LIB_SKIP_INSTALL_aarch64-apple-ios = 1 #lib$(1)-*.a
15+
CFG_STATIC_LIB_NAME_aarch64-apple-ios=lib$(1).a
16+
CFG_LIB_DSYM_GLOB_aarch64-apple-ios = lib$(1)-*.a.dSYM
17+
CFG_CFLAGS_aarch64-apple-ios := $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios)
18+
CFG_JEMALLOC_CFLAGS_aarch64-apple-ios := $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios)
19+
CFG_GCCISH_CFLAGS_aarch64-apple-ios := -Wall -Werror -fPIC $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios)
20+
CFG_GCCISH_CXXFLAGS_aarch64-apple-ios := -fno-rtti $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios) -I$(CFG_IOS_SDK_aarch64-apple-ios)/usr/include/c++/4.2.1
21+
CFG_GCCISH_LINK_FLAGS_aarch64-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK_aarch64-apple-ios) -Wl,-no_compact_unwind
22+
CFG_GCCISH_DEF_FLAG_aarch64-apple-ios := -Wl,-exported_symbols_list,
23+
CFG_GCCISH_PRE_LIB_FLAGS_aarch64-apple-ios :=
24+
CFG_GCCISH_POST_LIB_FLAGS_aarch64-apple-ios :=
25+
CFG_DEF_SUFFIX_aarch64-apple-ios := .darwin.def
26+
CFG_LLC_FLAGS_aarch64-apple-ios := -mattr=+neon,+cyclone,+fp-armv8
27+
CFG_INSTALL_NAME_aarch64-apple-ios = -Wl,-install_name,@rpath/$(1)
28+
CFG_LIBUV_LINK_FLAGS_aarch64-apple-ios =
29+
CFG_EXE_SUFFIX_aarch64-apple-ios :=
30+
CFG_WINDOWSY_aarch64-apple-ios :=
31+
CFG_UNIXY_aarch64-apple-ios := 1
32+
CFG_PATH_MUNGE_aarch64-apple-ios := true
33+
CFG_LDPATH_aarch64-apple-ios :=
34+
CFG_RUN_aarch64-apple-ios = $(2)
35+
CFG_RUN_TARG_aarch64-apple-ios = $(call CFG_RUN_aarch64-apple-ios,,$(2))
36+
CFG_GNU_TRIPLE_aarch64-apple-ios := aarch64-apple-ios

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

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

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# armv7-apple-ios configuration
2+
CFG_SDK_NAME_armv7-apple-ios := iphoneos
3+
CFG_SDK_ARCHS_armv7-apple-ios := armv7
4+
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5+
CFG_IOS_SDK_armv7-apple-ios := $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
6+
CFG_IOS_SDK_FLAGS_armv7-apple-ios := -target armv7-apple-ios -isysroot $(CFG_IOS_SDK_armv7-apple-ios) -mios-version-min=7.0
7+
CC_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
8+
CXX_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
9+
CPP_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
10+
AR_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
11+
endif
12+
CFG_LIB_NAME_armv7-apple-ios = lib$(1).a
13+
CFG_LIB_GLOB_armv7-apple-ios = lib$(1)-*.a
14+
CFG_LIB_SKIP_INSTALL_armv7-apple-ios = 1 #lib$(1)-*.a
15+
CFG_STATIC_LIB_NAME_armv7-apple-ios=lib$(1).a
16+
CFG_LIB_DSYM_GLOB_armv7-apple-ios = lib$(1)-*.a.dSYM
17+
CFG_JEMALLOC_CFLAGS_armv7-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_SDK_FLAGS_armv7-apple-ios)
18+
CFG_GCCISH_CFLAGS_armv7-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_SDK_FLAGS_armv7-apple-ios) -mfpu=vfp3 -arch armv7
19+
CFG_GCCISH_CXXFLAGS_armv7-apple-ios := -fno-rtti $(CFG_IOS_SDK_FLAGS_armv7-apple-ios) -I$(CFG_IOS_SDK_armv7-apple-ios)/usr/include/c++/4.2.1
20+
CFG_GCCISH_LINK_FLAGS_armv7-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK_armv7-apple-ios) -Wl,-no_compact_unwind
21+
CFG_GCCISH_DEF_FLAG_armv7-apple-ios := -Wl,-exported_symbols_list,
22+
CFG_GCCISH_PRE_LIB_FLAGS_armv7-apple-ios :=
23+
CFG_GCCISH_POST_LIB_FLAGS_armv7-apple-ios :=
24+
CFG_DEF_SUFFIX_armv7-apple-ios := .darwin.def
25+
CFG_LLC_FLAGS_armv7-apple-ios := -mattr=+vfp3,+v7,+neon -march=arm
26+
CFG_INSTALL_NAME_armv7-apple-ios = -Wl,-install_name,@rpath/$(1)
27+
CFG_EXE_SUFFIX_armv7-apple-ios :=
28+
CFG_WINDOWSY_armv7-apple-ios :=
29+
CFG_UNIXY_armv7-apple-ios := 1
30+
CFG_PATH_MUNGE_armv7-apple-ios := true
31+
CFG_LDPATH_armv7-apple-ios :=
32+
CFG_RUN_armv7-apple-ios = $(2)
33+
CFG_RUN_TARG_armv7-apple-ios = $(call CFG_RUN_armv7-apple-ios,,$(2))
34+
CFG_GNU_TRIPLE_armv7-apple-ios := armv7-apple-ios

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# armv7s-apple-ios configuration
2+
CFG_SDK_NAME_armv7s-apple-ios := iphoneos
3+
CFG_SDK_ARCHS_armv7s-apple-ios := armv7s
4+
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5+
CFG_IOS_SDK_armv7s-apple-ios := $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
6+
CFG_IOS_SDK_FLAGS_armv7s-apple-ios := -target armv7s-apple-ios -isysroot $(CFG_IOS_SDK_armv7s-apple-ios) -mios-version-min=7.0
7+
CC_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
8+
CXX_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
9+
CPP_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
10+
AR_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
11+
endif
12+
CFG_LIB_NAME_armv7s-apple-ios = lib$(1).a
13+
CFG_LIB_GLOB_armv7s-apple-ios = lib$(1)-*.a
14+
CFG_LIB_SKIP_INSTALL_armv7s-apple-ios = 1 #lib$(1)-*.a
15+
CFG_STATIC_LIB_NAME_armv7s-apple-ios=lib$(1).a
16+
CFG_LIB_DSYM_GLOB_armv7s-apple-ios = lib$(1)-*.a.dSYM
17+
CFG_JEMALLOC_CFLAGS_armv7s-apple-ios := -arch armv7s -mfpu=vfp4 $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios)
18+
CFG_GCCISH_CFLAGS_armv7s-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -mfpu=vfp4 -arch armv7s
19+
CFG_GCCISH_CXXFLAGS_armv7s-apple-ios := -fno-rtti $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -I$(CFG_IOS_SDK_armv7s-apple-ios)/usr/include/c++/4.2.1
20+
CFG_GCCISH_LINK_FLAGS_armv7s-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK_armv7s-apple-ios) -Wl,-no_compact_unwind
21+
CFG_GCCISH_DEF_FLAG_armv7s-apple-ios := -Wl,-exported_symbols_list,
22+
CFG_GCCISH_PRE_LIB_FLAGS_armv7s-apple-ios :=
23+
CFG_GCCISH_POST_LIB_FLAGS_armv7s-apple-ios :=
24+
CFG_DEF_SUFFIX_armv7s-apple-ios := .darwin.def
25+
CFG_LLC_FLAGS_armv7s-apple-ios := -mattr=+vfp4,+v7,+neon
26+
CFG_INSTALL_NAME_armv7s-apple-ios = -Wl,-install_name,@rpath/$(1)
27+
CFG_EXE_SUFFIX_armv7s-apple-ios :=
28+
CFG_WINDOWSY_armv7s-apple-ios :=
29+
CFG_UNIXY_armv7s-apple-ios := 1
30+
CFG_PATH_MUNGE_armv7s-apple-ios := true
31+
CFG_LDPATH_armv7s-apple-ios :=
32+
CFG_RUN_armv7s-apple-ios = $(2)
33+
CFG_RUN_TARG_armv7s-apple-ios = $(call CFG_RUN_armv7s-apple-ios,,$(2))
34+
CFG_GNU_TRIPLE_armv7s-apple-ios := armv7s-apple-ios

‎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 = $(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
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
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)
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
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
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) -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind
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
3333
CFG_GNU_TRIPLE_i386-apple-ios := i386-apple-ios

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# x86_64-apple-ios configuration
2+
CFG_SDK_NAME_x86_64-apple-ios := iphonesimulator
3+
CFG_SDK_ARCHS_x86_64-apple-ios := x86_64
4+
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5+
CFG_IOSSIM_SDK_x86_64-apple-ios := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
6+
CFG_IOSSIM_FLAGS_x86_64-apple-ios := -m64 -target x86_64-apple-ios -isysroot $(CFG_IOSSIM_SDK_x86_64-apple-ios) -mios-simulator-version-min=7.0
7+
CC_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang)
8+
CXX_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
9+
CPP_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
10+
AR_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator ar)
11+
endif
12+
CFG_LIB_NAME_x86_64-apple-ios = lib$(1).a
13+
CFG_LIB_GLOB_x86_64-apple-ios = lib$(1)-*.a
14+
CFG_LIB_SKIP_INSTALL_x86_64-apple-ios = 1 #lib$(1)-*.a
15+
CFG_STATIC_LIB_NAME_x86_64-apple-ios=lib$(1).a
16+
CFG_LIB_DSYM_GLOB_x86_64-apple-ios = lib$(1)-*.a.dSYM
17+
CFG_CFLAGS_x86_64-apple-ios := $(CFG_IOSSIM_FLAGS_x86_64-apple-ios)
18+
CFG_JEMALLOC_CFLAGS_x86_64-apple-ios := $(CFG_IOSSIM_FLAGS_x86_64-apple-ios)
19+
CFG_GCCISH_CFLAGS_x86_64-apple-ios := -Wall -Werror -fPIC $(CFG_IOSSIM_FLAGS_x86_64-apple-ios)
20+
CFG_GCCISH_CXXFLAGS_x86_64-apple-ios := -fno-rtti $(CFG_IOSSIM_FLAGS_x86_64-apple-ios) -I$(CFG_IOSSIM_SDK_x86_64-apple-ios)/usr/include/c++/4.2.1
21+
CFG_GCCISH_LINK_FLAGS_x86_64-apple-ios := -lpthread -Wl,-no_compact_unwind -m64 -Wl,-syslibroot $(CFG_IOSSIM_SDK_x86_64-apple-ios)
22+
CFG_GCCISH_DEF_FLAG_x86_64-apple-ios := -Wl,-exported_symbols_list,
23+
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-apple-ios :=
24+
CFG_GCCISH_POST_LIB_FLAGS_x86_64-apple-ios :=
25+
CFG_DEF_SUFFIX_x86_64-apple-ios := .darwin.def
26+
CFG_LLC_FLAGS_x86_64-apple-ios :=
27+
CFG_INSTALL_NAME_x86_64-apple-ios = -Wl,-install_name,@rpath/$(1)
28+
CFG_LIBUV_LINK_FLAGS_x86_64-apple-ios :=
29+
CFG_EXE_SUFFIX_x86_64-apple-ios :=
30+
CFG_WINDOWSY_x86_64-apple-ios :=
31+
CFG_UNIXY_x86_64-apple-ios := 1
32+
CFG_PATH_MUNGE_x86_64-apple-ios := true
33+
CFG_LDPATH_x86_64-apple-ios :=
34+
CFG_RUN_x86_64-apple-ios = $(2)
35+
CFG_RUN_TARG_x86_64-apple-ios = $(call CFG_RUN_x86_64-apple-ios,,$(2))
36+
CFG_GNU_TRIPLE_i386-apple-ios := x86_64-apple-ios

‎branches/try/mk/docs.mk

Lines changed: 7 additions & 1 deletion
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
@@ -277,6 +283,6 @@ compiler-docs: $(COMPILER_DOC_TARGETS)
277283

278284
trpl: doc/book/index.html
279285

280-
doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md)
286+
doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/
281287
$(Q)rm -rf doc/book
282288
$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book

‎branches/try/src/compiler-rt

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

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ pub struct TestProps {
4242
pub pretty_compare_only: bool,
4343
// Patterns which must not appear in the output of a cfail test.
4444
pub forbid_output: Vec<String>,
45-
// Ignore errors which originate from a command line span
46-
pub ignore_command_line: bool,
4745
}
4846

4947
// Load any test directives embedded in the file
@@ -62,8 +60,6 @@ pub fn load_props(testfile: &Path) -> TestProps {
6260
let mut pretty_mode = None;
6361
let mut pretty_compare_only = false;
6462
let mut forbid_output = Vec::new();
65-
let mut ignore_command_line = false;
66-
6763
iter_header(testfile, |ln| {
6864
match parse_error_pattern(ln) {
6965
Some(ep) => error_patterns.push(ep),
@@ -106,10 +102,6 @@ pub fn load_props(testfile: &Path) -> TestProps {
106102
pretty_compare_only = parse_pretty_compare_only(ln);
107103
}
108104

109-
if !ignore_command_line {
110-
ignore_command_line = parse_ignore_command_line(ln);
111-
}
112-
113105
match parse_aux_build(ln) {
114106
Some(ab) => { aux_builds.push(ab); }
115107
None => {}
@@ -148,7 +140,6 @@ pub fn load_props(testfile: &Path) -> TestProps {
148140
pretty_mode: pretty_mode.unwrap_or("normal".to_string()),
149141
pretty_compare_only: pretty_compare_only,
150142
forbid_output: forbid_output,
151-
ignore_command_line: ignore_command_line,
152143
}
153144
}
154145

@@ -300,10 +291,6 @@ fn parse_pretty_compare_only(line: &str) -> bool {
300291
parse_name_directive(line, "pretty-compare-only")
301292
}
302293

303-
fn parse_ignore_command_line(line: &str) -> bool {
304-
parse_name_directive(line, "ignore-command-line")
305-
}
306-
307294
fn parse_exec_env(line: &str) -> Option<(String, String)> {
308295
parse_name_value_directive(line, "exec-env").map(|nv| {
309296
// nv is either FOO or FOO=BAR

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ fn run_cfail_test(config: &Config, props: &TestProps, testfile: &Path) {
104104
if !props.error_patterns.is_empty() {
105105
fatal("both error pattern and expected errors specified");
106106
}
107-
check_expected_errors(props, expected_errors, testfile, &proc_res);
107+
check_expected_errors(expected_errors, testfile, &proc_res);
108108
} else {
109109
check_error_patterns(props, testfile, output_to_check.as_slice(), &proc_res);
110110
}
@@ -941,8 +941,7 @@ fn check_forbid_output(props: &TestProps,
941941
}
942942
}
943943

944-
fn check_expected_errors(props: &TestProps,
945-
expected_errors: Vec<errors::ExpectedError> ,
944+
fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
946945
testfile: &Path,
947946
proc_res: &ProcRes) {
948947

@@ -997,11 +996,6 @@ fn check_expected_errors(props: &TestProps,
997996
was_expected = true;
998997
}
999998

1000-
if line.starts_with("<command line option>") &&
1001-
props.ignore_command_line {
1002-
was_expected = true;
1003-
}
1004-
1005999
if !was_expected && is_compiler_error_or_warning(line) {
10061000
fatal_proc_rec(format!("unexpected compiler error or warning: '{}'",
10071001
line).as_slice(),

‎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).

0 commit comments

Comments
 (0)