Skip to content

Commit 8703402

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 229187 b: refs/heads/try c: 5cccf3c h: refs/heads/master i: 229185: ff234bf 229183: 80eba7c v: v3
1 parent 1191d9d commit 8703402

File tree

251 files changed

+788
-1224
lines changed

Some content is hidden

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

251 files changed

+788
-1224
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: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: efdbc0ec7e9bd8d2dadbe78b003fd7facf2a7aae
4+
refs/heads/try: 5cccf3cd256420d9f32c265e83036dea1d5f94d8
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try/RELEASES.md

Lines changed: 1 addition & 1 deletion

‎branches/try/mk/docs.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE)
7777

7878
D := $(S)src/doc
7979

80-
DOC_TARGETS := trpl nomicon style error-index
80+
DOC_TARGETS := trpl tarpl style error-index
8181
COMPILER_DOC_TARGETS :=
8282
DOC_L10N_TARGETS :=
8383

@@ -287,12 +287,12 @@ doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/
287287
$(Q)rm -rf doc/book
288288
$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book
289289

290-
nomicon: doc/nomicon/index.html
290+
tarpl: doc/adv-book/index.html
291291

292-
doc/nomicon/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/nomicon/*.md) | doc/
292+
doc/adv-book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/tarpl/*.md) | doc/
293293
@$(call E, rustbook: $@)
294-
$(Q)rm -rf doc/nomicon
295-
$(Q)$(RUSTBOOK) build $(S)src/doc/nomicon doc/nomicon
294+
$(Q)rm -rf doc/adv-book
295+
$(Q)$(RUSTBOOK) build $(S)src/doc/tarpl doc/adv-book
296296

297297
style: doc/style/index.html
298298

‎branches/try/mk/tests.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ $(foreach doc,$(DOCS), \
162162
$(eval $(call DOCTEST,md-$(doc),$(S)src/doc/$(doc).md)))
163163
$(foreach file,$(wildcard $(S)src/doc/trpl/*.md), \
164164
$(eval $(call DOCTEST,$(file:$(S)src/doc/trpl/%.md=trpl-%),$(file))))
165-
$(foreach file,$(wildcard $(S)src/doc/nomicon/*.md), \
166-
$(eval $(call DOCTEST,$(file:$(S)src/doc/nomicon/%.md=nomicon-%),$(file))))
165+
$(foreach file,$(wildcard $(S)src/doc/tarpl/*.md), \
166+
$(eval $(call DOCTEST,$(file:$(S)src/doc/tarpl/%.md=tarpl-%),$(file))))
167167
######################################################################
168168
# Main test targets
169169
######################################################################

‎branches/try/src/doc/nomicon/README.md

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

‎branches/try/src/doc/tarpl/README.md

Lines changed: 34 additions & 0 deletions

‎branches/try/src/doc/nomicon/SUMMARY.md renamed to ‎branches/try/src/doc/tarpl/SUMMARY.md

‎branches/try/src/doc/nomicon/arc-and-mutex.md renamed to ‎branches/try/src/doc/tarpl/arc-and-mutex.md

‎branches/try/src/doc/nomicon/atomics.md renamed to ‎branches/try/src/doc/tarpl/atomics.md

‎branches/try/src/doc/nomicon/borrow-splitting.md renamed to ‎branches/try/src/doc/tarpl/borrow-splitting.md

‎branches/try/src/doc/nomicon/casts.md renamed to ‎branches/try/src/doc/tarpl/casts.md

‎branches/try/src/doc/nomicon/checked-uninit.md renamed to ‎branches/try/src/doc/tarpl/checked-uninit.md

‎branches/try/src/doc/nomicon/coercions.md renamed to ‎branches/try/src/doc/tarpl/coercions.md

‎branches/try/src/doc/nomicon/concurrency.md renamed to ‎branches/try/src/doc/tarpl/concurrency.md

‎branches/try/src/doc/nomicon/constructors.md renamed to ‎branches/try/src/doc/tarpl/constructors.md

‎branches/try/src/doc/nomicon/conversions.md renamed to ‎branches/try/src/doc/tarpl/conversions.md

‎branches/try/src/doc/nomicon/data.md renamed to ‎branches/try/src/doc/tarpl/data.md

‎branches/try/src/doc/nomicon/destructors.md renamed to ‎branches/try/src/doc/tarpl/destructors.md

‎branches/try/src/doc/nomicon/dot-operator.md renamed to ‎branches/try/src/doc/tarpl/dot-operator.md

‎branches/try/src/doc/nomicon/drop-flags.md renamed to ‎branches/try/src/doc/tarpl/drop-flags.md

‎branches/try/src/doc/nomicon/dropck.md renamed to ‎branches/try/src/doc/tarpl/dropck.md

‎branches/try/src/doc/nomicon/exception-safety.md renamed to ‎branches/try/src/doc/tarpl/exception-safety.md

‎branches/try/src/doc/nomicon/exotic-sizes.md renamed to ‎branches/try/src/doc/tarpl/exotic-sizes.md

‎branches/try/src/doc/nomicon/hrtb.md renamed to ‎branches/try/src/doc/tarpl/hrtb.md

‎branches/try/src/doc/nomicon/leaking.md renamed to ‎branches/try/src/doc/tarpl/leaking.md

‎branches/try/src/doc/nomicon/lifetime-elision.md renamed to ‎branches/try/src/doc/tarpl/lifetime-elision.md

‎branches/try/src/doc/nomicon/lifetime-mismatch.md renamed to ‎branches/try/src/doc/tarpl/lifetime-mismatch.md

‎branches/try/src/doc/nomicon/lifetimes.md renamed to ‎branches/try/src/doc/tarpl/lifetimes.md

‎branches/try/src/doc/nomicon/meet-safe-and-unsafe.md renamed to ‎branches/try/src/doc/tarpl/meet-safe-and-unsafe.md

‎branches/try/src/doc/nomicon/obrm.md renamed to ‎branches/try/src/doc/tarpl/obrm.md

‎branches/try/src/doc/nomicon/other-reprs.md renamed to ‎branches/try/src/doc/tarpl/other-reprs.md

‎branches/try/src/doc/nomicon/ownership.md renamed to ‎branches/try/src/doc/tarpl/ownership.md

‎branches/try/src/doc/nomicon/phantom-data.md renamed to ‎branches/try/src/doc/tarpl/phantom-data.md

‎branches/try/src/doc/nomicon/poisoning.md renamed to ‎branches/try/src/doc/tarpl/poisoning.md

‎branches/try/src/doc/nomicon/races.md renamed to ‎branches/try/src/doc/tarpl/races.md

‎branches/try/src/doc/nomicon/references.md renamed to ‎branches/try/src/doc/tarpl/references.md

‎branches/try/src/doc/nomicon/repr-rust.md renamed to ‎branches/try/src/doc/tarpl/repr-rust.md

‎branches/try/src/doc/nomicon/safe-unsafe-meaning.md renamed to ‎branches/try/src/doc/tarpl/safe-unsafe-meaning.md

‎branches/try/src/doc/nomicon/send-and-sync.md renamed to ‎branches/try/src/doc/tarpl/send-and-sync.md

‎branches/try/src/doc/nomicon/subtyping.md renamed to ‎branches/try/src/doc/tarpl/subtyping.md

‎branches/try/src/doc/nomicon/transmutes.md renamed to ‎branches/try/src/doc/tarpl/transmutes.md

‎branches/try/src/doc/nomicon/unbounded-lifetimes.md renamed to ‎branches/try/src/doc/tarpl/unbounded-lifetimes.md

‎branches/try/src/doc/nomicon/unchecked-uninit.md renamed to ‎branches/try/src/doc/tarpl/unchecked-uninit.md

‎branches/try/src/doc/nomicon/uninitialized.md renamed to ‎branches/try/src/doc/tarpl/uninitialized.md

‎branches/try/src/doc/nomicon/unwinding.md renamed to ‎branches/try/src/doc/tarpl/unwinding.md

‎branches/try/src/doc/nomicon/vec-alloc.md renamed to ‎branches/try/src/doc/tarpl/vec-alloc.md

‎branches/try/src/doc/nomicon/vec-dealloc.md renamed to ‎branches/try/src/doc/tarpl/vec-dealloc.md

‎branches/try/src/doc/nomicon/vec-deref.md renamed to ‎branches/try/src/doc/tarpl/vec-deref.md

‎branches/try/src/doc/nomicon/vec-drain.md renamed to ‎branches/try/src/doc/tarpl/vec-drain.md

‎branches/try/src/doc/nomicon/vec-final.md renamed to ‎branches/try/src/doc/tarpl/vec-final.md

‎branches/try/src/doc/nomicon/vec-insert-remove.md renamed to ‎branches/try/src/doc/tarpl/vec-insert-remove.md

‎branches/try/src/doc/nomicon/vec-into-iter.md renamed to ‎branches/try/src/doc/tarpl/vec-into-iter.md

‎branches/try/src/doc/nomicon/vec-layout.md renamed to ‎branches/try/src/doc/tarpl/vec-layout.md

‎branches/try/src/doc/nomicon/vec-push-pop.md renamed to ‎branches/try/src/doc/tarpl/vec-push-pop.md

‎branches/try/src/doc/nomicon/vec-raw.md renamed to ‎branches/try/src/doc/tarpl/vec-raw.md

‎branches/try/src/doc/nomicon/vec-zsts.md renamed to ‎branches/try/src/doc/tarpl/vec-zsts.md

‎branches/try/src/doc/nomicon/vec.md renamed to ‎branches/try/src/doc/tarpl/vec.md

‎branches/try/src/doc/nomicon/working-with-unsafe.md renamed to ‎branches/try/src/doc/tarpl/working-with-unsafe.md

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

Lines changed: 6 additions & 6 deletions

‎branches/try/src/doc/trpl/guessing-game.md

Lines changed: 2 additions & 2 deletions

‎branches/try/src/doc/trpl/hello-cargo.md

Lines changed: 17 additions & 19 deletions

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

Lines changed: 41 additions & 38 deletions

‎branches/try/src/liballoc/arc.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@
7171
7272
use boxed::Box;
7373

74-
use core::prelude::*;
74+
#[cfg(stage0)]
75+
use core::prelude::v1::*;
7576

7677
use core::atomic;
7778
use core::atomic::Ordering::{Relaxed, Release, Acquire, SeqCst};

‎branches/try/src/liballoc/boxed.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
5454
#![stable(feature = "rust1", since = "1.0.0")]
5555

56-
use core::prelude::*;
56+
#[cfg(stage0)]
57+
use core::prelude::v1::*;
5758

5859
use heap;
5960
use raw_vec::RawVec;

0 commit comments

Comments
 (0)