Skip to content

Commit 6bf21b2

Browse files
vhbitvhbit
committed
---
yaml --- r: 172718 b: refs/heads/try c: 1fb91dc h: refs/heads/master v: v3
1 parent 5345d82 commit 6bf21b2

File tree

1,054 files changed

+9883
-9603
lines changed

Some content is hidden

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

1,054 files changed

+9883
-9603
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: 2e2372c6c4a265992b0eb615ea9fdee4ab999143
5+
refs/heads/try: 1fb91dc1c2a34e5cbe384493616254253c821e41
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

‎branches/try/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ documentation.
66
## Quick Start
77

88
1. Download a [binary installer][installer] for your platform.
9-
2. Read [The Rust Programming Language][trpl].
9+
2. Read the [guide].
1010
3. Enjoy!
1111

1212
> ***Note:*** Windows users can read the detailed
1313
> [using Rust on Windows][win-wiki] notes on the wiki.
1414
1515
[installer]: http://www.rust-lang.org/install.html
16-
[trpl]: http://doc.rust-lang.org/book/index.html
16+
[guide]: http://doc.rust-lang.org/guide.html
1717
[win-wiki]: https://github.com/rust-lang/rust/wiki/Using-Rust-on-Windows
1818

1919
## Building from Source
@@ -53,7 +53,7 @@ documentation.
5353
When complete, `make install` will place several programs into
5454
`/usr/local/bin`: `rustc`, the Rust compiler, and `rustdoc`, the
5555
API-documentation tool.
56-
3. Read [The Rust Programming Language][trpl].
56+
3. Read the [guide].
5757
4. Enjoy!
5858

5959
### Building on Windows
@@ -75,7 +75,7 @@ To easily build on windows we can use [MSYS2](http://sourceforge.net/projects/ms
7575

7676
[repo]: https://github.com/rust-lang/rust
7777
[tarball]: https://static.rust-lang.org/dist/rust-nightly.tar.gz
78-
[trpl]: http://doc.rust-lang.org/book/index.html
78+
[guide]: http://doc.rust-lang.org/guide.html
7979

8080
## Notes
8181

‎branches/try/RELEASES.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ Version 1.0.0-alpha (January 2015)
1919
distribution into the Cargo ecosystem so they can evolve
2020
separately and don't need to be stabilized as quickly, including
2121
'time', 'getopts', 'num', 'regex', and 'term'.
22-
* Documentation continues to be expanded with more API coverage, more
23-
examples, and more in-depth explanations. The guides have been
24-
consolidated into [The Rust Programming Language][trpl].
25-
* "Rust By Example" is now maintained by the Rust team.
22+
* Documentation continues to be expanded with more guides, more
23+
API coverage and more examples.
2624
* All official Rust binary installers now come with [Cargo], the
2725
Rust package manager.
2826

@@ -181,7 +179,6 @@ Version 1.0.0-alpha (January 2015)
181179
[objsafe]: https://github.com/rust-lang/rfcs/blob/master/text/0255-object-safety.md
182180
[assoc]: https://github.com/rust-lang/rfcs/blob/master/text/0195-associated-items.md
183181
[ints]: https://github.com/rust-lang/rfcs/pull/544#issuecomment-68760871
184-
[trpl]: http://doc.rust-lang.org/book/index.html
185182

186183
Version 0.12.0 (October 2014)
187184
-----------------------------

‎branches/try/configure

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,6 +1055,18 @@ do
10551055
make_dir $h/test/debuginfo-gdb
10561056
make_dir $h/test/debuginfo-lldb
10571057
make_dir $h/test/codegen
1058+
make_dir $h/test/doc-guide
1059+
make_dir $h/test/doc-guide-ffi
1060+
make_dir $h/test/doc-guide-runtime
1061+
make_dir $h/test/doc-guide-macros
1062+
make_dir $h/test/doc-guide-ownership
1063+
make_dir $h/test/doc-guide-pointers
1064+
make_dir $h/test/doc-guide-container
1065+
make_dir $h/test/doc-guide-tasks
1066+
make_dir $h/test/doc-guide-plugin
1067+
make_dir $h/test/doc-guide-crates
1068+
make_dir $h/test/doc-guide-error-handling
1069+
make_dir $h/test/doc-reference
10581070
done
10591071

10601072
# Configure submodules

‎branches/try/mk/crates.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
5757
rustc_trans rustc_back rustc_llvm
5858
HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc fmt_macros
5959
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
60-
TOOLS := compiletest rustdoc rustc rustbook
60+
TOOLS := compiletest rustdoc rustc
6161

6262
DEPS_core :=
6363
DEPS_libc := core
@@ -99,11 +99,9 @@ DEPS_fmt_macros = std
9999
TOOL_DEPS_compiletest := test getopts
100100
TOOL_DEPS_rustdoc := rustdoc
101101
TOOL_DEPS_rustc := rustc_driver
102-
TOOL_DEPS_rustbook := std regex rustdoc
103102
TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
104103
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
105104
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
106-
TOOL_SOURCE_rustbook := $(S)src/rustbook/main.rs
107105

108106
ONLY_RLIB_core := 1
109107
ONLY_RLIB_libc := 1

‎branches/try/mk/dist.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ PKG_FILES := \
5959
rustllvm \
6060
snapshots.txt \
6161
rust-installer \
62-
rustbook \
6362
test) \
6463
$(PKG_GITMODULES) \
6564
$(filter-out config.stamp, \

‎branches/try/mk/docs.mk

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# except according to those terms.
1010

1111
######################################################################
12-
# The various pieces of standalone documentation.
12+
# The various pieces of standalone documentation: guides, manual, etc
1313
#
1414
# The DOCS variable is their names (with no file extension).
1515
#
@@ -25,11 +25,13 @@
2525
# L10N_LANGS are the languages for which the docs have been
2626
# translated.
2727
######################################################################
28-
DOCS := index intro tutorial complement-bugreport \
29-
complement-lang-faq complement-design-faq complement-project-faq \
30-
rustdoc reference
28+
DOCS := index intro tutorial guide guide-ffi guide-macros guide-ownership \
29+
guide-tasks guide-container guide-pointers guide-testing \
30+
guide-plugin guide-crates complement-bugreport guide-error-handling \
31+
complement-lang-faq complement-design-faq complement-project-faq \
32+
rustdoc guide-unsafe guide-strings reference
3133

32-
PDF_DOCS := reference
34+
PDF_DOCS := guide reference
3335

3436
RUSTDOC_DEPS_reference := doc/full-toc.inc
3537
RUSTDOC_FLAGS_reference := --html-in-header=doc/full-toc.inc
@@ -59,15 +61,9 @@ RUSTDOC_EXE = $(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD))
5961
# ./configure
6062
RUSTDOC = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(RUSTDOC_EXE)
6163

62-
# The rustbook executable...
63-
RUSTBOOK_EXE = $(HBIN2_H_$(CFG_BUILD))/rustbook$(X_$(CFG_BUILD))
64-
# ...with rpath included in case --disable-rpath was provided to
65-
# ./configure
66-
RUSTBOOK = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(RUSTBOOK_EXE)
67-
6864
D := $(S)src/doc
6965

70-
DOC_TARGETS := trpl
66+
DOC_TARGETS :=
7167
COMPILER_DOC_TARGETS :=
7268
DOC_L10N_TARGETS :=
7369

@@ -274,9 +270,3 @@ endif
274270

275271
docs: $(DOC_TARGETS)
276272
compiler-docs: $(COMPILER_DOC_TARGETS)
277-
278-
trpl: doc/book/index.html
279-
280-
doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md)
281-
$(Q)rm -rf doc/book
282-
$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book

‎branches/try/mk/main.mk

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
# The version number
1616
CFG_RELEASE_NUM=1.0.0
1717

18-
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
19-
# NB Make sure it starts with a dot to conform to semver pre-release
20-
# versions (section 9)
21-
CFG_PRERELEASE_VERSION=
18+
# An optional number to put after the label, e.g. '2' -> '-beta2'
19+
CFG_BETA_CYCLE=
2220

2321
CFG_FILENAME_EXTRA=4e7c5e5c
2422

@@ -31,8 +29,8 @@ CFG_DISABLE_UNSTABLE_FEATURES=1
3129
endif
3230
ifeq ($(CFG_RELEASE_CHANNEL),beta)
3331
# The beta channel is temporarily called 'alpha'
34-
CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
35-
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
32+
CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
33+
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
3634
CFG_DISABLE_UNSTABLE_FEATURES=1
3735
endif
3836
ifeq ($(CFG_RELEASE_CHANNEL),nightly)

‎branches/try/mk/prepare.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ define PREPARE_MAN
7070
$(Q)$(PREPARE_MAN_CMD) $(PREPARE_SOURCE_MAN_DIR)/$(1) $(PREPARE_DEST_MAN_DIR)/$(1)
7171
endef
7272

73-
PREPARE_TOOLS = $(filter-out compiletest rustbook, $(TOOLS))
73+
PREPARE_TOOLS = $(filter-out compiletest, $(TOOLS))
7474

7575

7676
# $(1) is tool

‎branches/try/mk/tests.mk

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -147,17 +147,6 @@ else
147147
CFG_ADB_TEST_DIR=
148148
endif
149149

150-
# $(1) - name of doc test
151-
# $(2) - file of the test
152-
define DOCTEST
153-
DOC_NAMES := $$(DOC_NAMES) $(1)
154-
DOCFILE_$(1) := $(2)
155-
endef
156-
157-
$(foreach doc,$(DOCS), \
158-
$(eval $(call DOCTEST,md-$(doc),$(S)src/doc/$(doc).md)))
159-
$(foreach file,$(wildcard $(S)src/doc/trpl/*.md), \
160-
$(eval $(call DOCTEST,$(file:$(S)src/doc/trpl/%.md=trpl-%),$(file))))
161150

162151
######################################################################
163152
# Main test targets
@@ -303,7 +292,6 @@ tidy:
303292
| grep '^$(S)src/rust-installer' -v \
304293
| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
305294

306-
307295
endif
308296

309297

@@ -351,8 +339,8 @@ check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec: \
351339
check-stage$(1)-T-$(2)-H-$(3)-doc-crate-$$(crate)-exec)
352340

353341
check-stage$(1)-T-$(2)-H-$(3)-doc-exec: \
354-
$$(foreach docname,$$(DOC_NAMES), \
355-
check-stage$(1)-T-$(2)-H-$(3)-doc-$$(docname)-exec) \
342+
$$(foreach docname,$$(DOCS), \
343+
check-stage$(1)-T-$(2)-H-$(3)-doc-$$(docname)-exec)
356344

357345
check-stage$(1)-T-$(2)-H-$(3)-pretty-exec: \
358346
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-exec \
@@ -807,18 +795,17 @@ check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3)
807795
# rustdoc etc.
808796
ifeq ($(NO_REBUILD),)
809797
DOCTESTDEP_$(1)_$(2)_$(3)_$(4) = \
810-
$$(DOCFILE_$(4)) \
798+
$$(D)/$(4).md \
811799
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
812800
$$(RUSTDOC_EXE_$(1)_T_$(2)_H_$(3))
813801
else
814-
DOCTESTDEP_$(1)_$(2)_$(3)_$(4) = $$(DOCFILE_$(4))
802+
DOCTESTDEP_$(1)_$(2)_$(3)_$(4) = $$(D)/$(4).md
815803
endif
816804

817805
ifeq ($(2),$$(CFG_BUILD))
818806
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): $$(DOCTESTDEP_$(1)_$(2)_$(3)_$(4))
819807
@$$(call E, run doc-$(4) [$(2)])
820-
$$(Q)$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --cfg dox --test $$< \
821-
--test-args "$$(TESTARGS)" && touch $$@
808+
$$(Q)$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --cfg dox --test $$< --test-args "$$(TESTARGS)" && touch $$@
822809
else
823810
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)):
824811
touch $$@
@@ -828,7 +815,7 @@ endef
828815
$(foreach host,$(CFG_HOST), \
829816
$(foreach target,$(CFG_TARGET), \
830817
$(foreach stage,$(STAGES), \
831-
$(foreach docname,$(DOC_NAMES), \
818+
$(foreach docname,$(DOCS), \
832819
$(eval $(call DEF_DOC_TEST,$(stage),$(target),$(host),$(docname)))))))
833820

834821
# Crates
@@ -890,7 +877,7 @@ TEST_GROUPS = \
890877
debuginfo-lldb \
891878
codegen \
892879
doc \
893-
$(foreach docname,$(DOC_NAMES),doc-$(docname)) \
880+
$(foreach docname,$(DOCS),doc-$(docname)) \
894881
pretty \
895882
pretty-rpass \
896883
pretty-rpass-valgrind \
@@ -959,7 +946,7 @@ $(foreach stage,$(STAGES), \
959946
$(eval $(call DEF_CHECK_FOR_STAGE_AND_HOSTS_AND_GROUP,$(stage),$(host),$(group))))))
960947

961948
define DEF_CHECK_DOC_FOR_STAGE
962-
check-stage$(1)-docs: $$(foreach docname,$$(DOC_NAMES), \
949+
check-stage$(1)-docs: $$(foreach docname,$$(DOCS), \
963950
check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-$$(docname)) \
964951
$$(foreach crate,$$(TEST_DOC_CRATES), \
965952
check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-crate-$$(crate))

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#![allow(unknown_features)]
1313
#![feature(slicing_syntax, unboxed_closures)]
1414
#![feature(box_syntax)]
15-
#![feature(int_uint)]
1615

1716
#![deny(warnings)]
1817

‎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-container.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
% The Rust Containers and Iterators Guide
2+
3+
This guide has been removed, with no direct replacement.
4+
5+
You may enjoy reading the [iterator](std/iter/index.html) and
6+
[collections](std/collections/index.html) documentation.

‎branches/try/src/doc/trpl/crates-and-modules.md renamed to ‎branches/try/src/doc/guide-crates.md

File renamed without changes.

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

File renamed without changes.

‎branches/try/src/doc/trpl/ffi.md renamed to ‎branches/try/src/doc/guide-ffi.md

File renamed without changes.

‎branches/try/src/doc/trpl/macros.md renamed to ‎branches/try/src/doc/guide-macros.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ When this library is loaded with `#[use_macros] extern crate`, only `m2` will
507507
be imported.
508508

509509
The Rust Reference has a [listing of macro-related
510-
attributes](../reference.html#macro--and-plugin-related-attributes).
510+
attributes](reference.html#macro--and-plugin-related-attributes).
511511

512512
# The variable `$crate`
513513

@@ -567,7 +567,7 @@ intermediate states out, and passing the flag `--pretty expanded` as a
567567
command-line argument to the compiler will show the result of expansion.
568568

569569
If Rust's macro system can't do what you need, you may want to write a
570-
[compiler plugin](plugin.html) instead. Compared to `macro_rules!`
570+
[compiler plugin](guide-plugin.html) instead. Compared to `macro_rules!`
571571
macros, this is significantly more work, the interfaces are much less stable,
572572
and the warnings about debugging apply ten-fold. In exchange you get the
573573
flexibility of running arbitrary Rust code within the compiler. Syntax

‎branches/try/src/doc/trpl/ownership.md renamed to ‎branches/try/src/doc/guide-ownership.md

File renamed without changes.

0 commit comments

Comments
 (0)