---

yaml
---
r: 223245
b: refs/heads/auto
c: 5429c9b
h: refs/heads/master
i:
  223243: f0aae55
v: v3

Author: GuillaumeGomez

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 1b5d52122e4dfa1cfd9d8c5afab931150269a7ff
+refs/heads/auto: 5429c9be78a0d55424a65244b956ea50e79c1f1e
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/.travis.yml

@@ -20,7 +20,8 @@ sudo: false
 before_script:
   - ./configure --enable-ccache
 script:
-  - make tidy check -j4
+  - make tidy
+  - make rustc-stage1 -j4
 
 env:
   - CXX=/usr/bin/g++-4.7

branches/auto/RELEASES.md

@@ -16,12 +16,6 @@ Highlights
   jobs). It's not enabled by default, but will be "in the near
   future". It can be activated with the `-C codegen-units=N` flag to
   `rustc`.
-* This is the first release with [experimental support for linking
-  with the MSVC linker and lib C on Windows (instead of using the GNU
-  variants via MinGW)][win]. It is yet recommended only for the most
-  intrepid Rusticians.
-* Benchmark compilations are showing a 30% improvement in
-  bootstrapping over 1.1.
 
 Breaking Changes
 ----------------
@@ -37,10 +31,6 @@ Breaking Changes
 * [The `#[packed]` attribute is no longer silently accepted by the
   compiler][packed]. This attribute did nothing and code that
   mentioned it likely did not work as intended.
-* Associated type defaults are [now behind the
-  `associated_type_defaults` feature gate][ad]. In 1.1 associated type
-  defaults *did not work*, but could be mentioned syntactically. As
-  such this breakage has minimal impact.
 
 Language
 --------
@@ -56,11 +46,12 @@ Libraries
   `LinkedList`, `VecDeque`, `EnumSet`, `BinaryHeap`, `VecMap`,
   `BTreeSet` and `BTreeMap`. [RFC][extend-rfc].
 * The [`iter::once`] function returns an iterator that yields a single
-  element, and [`iter::empty`] returns an iterator that yields no
+  element.
+* The [`iter::empty`] function returns an iterator that yields no
   elements.
 * The [`matches`] and [`rmatches`] methods on `str` return iterators
   over substring matches.
-* [`Cell`] and [`RefCell`] both implement `Eq`.
+* [`Cell`] and [`RefCell`] both implement [`Eq`].
 * A number of methods for wrapping arithmetic are added to the
   integral types, [`wrapping_div`], [`wrapping_rem`],
   [`wrapping_neg`], [`wrapping_shl`], [`wrapping_shr`]. These are in
@@ -79,7 +70,7 @@ Libraries
   are used by code generators to emit implementations of [`Debug`].
 * `str` has new [`to_uppercase`][strup] and [`to_lowercase`][strlow]
   methods that convert case, following Unicode case mapping.
-* It is now easier to handle poisoned locks. The [`PoisonError`]
+* It is now easier to handle to poisoned locks. The [`PoisonError`]
   type, returned by failing lock operations, exposes `into_inner`,
   `get_ref`, and `get_mut`, which all give access to the inner lock
   guard, and allow the poisoned lock to continue to operate. The
@@ -153,8 +144,6 @@ Misc
 [dst]: https://github.com/rust-lang/rfcs/blob/master/text/0982-dst-coercion.md
 [parcodegen]: https://github.com/rust-lang/rust/pull/26018
 [packed]: https://github.com/rust-lang/rust/pull/25541
-[ad]: https://github.com/rust-lang/rust/pull/27382
-[win]: https://github.com/rust-lang/rust/pull/25350
 
 Version 1.1.0 (June 2015)
 =========================

branches/auto/configure

@@ -1005,9 +1005,11 @@ then
         (''|*clang)
         CFG_CLANG_REPORTED_VERSION=$($CFG_CC --version | grep version)
 
-        if echo $CFG_CLANG_REPORTED_VERSION | grep -q "(based on LLVM "; then
+        if [[ $CFG_CLANG_REPORTED_VERSION == *"(based on LLVM "* ]]
+        then
             CFG_CLANG_VERSION=$(echo $CFG_CLANG_REPORTED_VERSION | sed 's/.*(based on LLVM \(.*\))/\1/')
-        elif echo $CFG_CLANG_REPORTED_VERSION | grep -q "Apple LLVM"; then
+        elif [[ $CFG_CLANG_REPORTED_VERSION == "Apple LLVM"* ]]
+        then
             CFG_OSX_CLANG_VERSION=$(echo $CFG_CLANG_REPORTED_VERSION | sed 's/.*version \(.*\) .*/\1/')
         else
             CFG_CLANG_VERSION=$(echo $CFG_CLANG_REPORTED_VERSION | sed 's/.*version \(.*\) .*/\1/')

branches/auto/mk/ctags.mk

@@ -15,11 +15,24 @@
 
 .PHONY: TAGS.emacs TAGS.vi
 
-CTAGS_LOCATIONS=$(wildcard ${CFG_SRC_DIR}src/lib*)
-CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/librust%,, \
-                $(patsubst ${CFG_SRC_DIR}src/lib%test,, \
-				$(wildcard ${CFG_SRC_DIR}src/lib*))) ${CFG_SRC_DIR}src/libtest
-CTAGS_OPTS=--options="${CFG_SRC_DIR}src/etc/ctags.rust" --languages=Rust --recurse ${CTAGS_LOCATIONS}
+# This is using a blacklist approach, probably more durable than a whitelist.
+# We exclude: external dependencies (llvm, rt/{msvc,vg}),
+# tests (compiletest, test) and a couple of other things (rt/arch, etc)
+CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,, \
+				$(patsubst ${CFG_SRC_DIR}src/compiletest,, \
+				$(patsubst ${CFG_SRC_DIR}src/test,, \
+				$(patsubst ${CFG_SRC_DIR}src/etc,, \
+				$(patsubst ${CFG_SRC_DIR}src/rt,, \
+				$(patsubst ${CFG_SRC_DIR}src/rt/arch,, \
+				$(patsubst ${CFG_SRC_DIR}src/rt/msvc,, \
+				$(patsubst ${CFG_SRC_DIR}src/rt/vg,, \
+				$(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*) \
+				))))))))
+CTAGS_OPTS=--options="${CFG_SRC_DIR}src/etc/ctags.rust" --languages=-javascript --recurse ${CTAGS_LOCATIONS}
+# We could use `--languages=Rust`, but there is value in producing tags for the
+# C++ parts of the code base too (at the time of writing, those are .h and .cpp
+# files in src/rt, src/rt/sync and src/rustllvm); we mainly just want to
+# exclude the external dependencies.
 
 TAGS.emacs:
 	ctags -e -f $@ ${CTAGS_OPTS}

branches/auto/mk/docs.mk

@@ -77,7 +77,7 @@ ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE)
 
 D := $(S)src/doc
 
-DOC_TARGETS := trpl nomicon style error-index
+DOC_TARGETS := trpl style error-index
 COMPILER_DOC_TARGETS :=
 DOC_L10N_TARGETS :=
 
@@ -287,13 +287,6 @@ doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/
 	$(Q)rm -rf doc/book
 	$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book
 
-nomicon: doc/nomicon/index.html
-
-doc/nomicon/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/nomicon/*.md) | doc/
-	@$(call E, rustbook: $@)
-	$(Q)rm -rf doc/nomicon
-	$(Q)$(RUSTBOOK) build $(S)src/doc/nomicon doc/nomicon
-
 style: doc/style/index.html
 
 doc/style/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/style/*.md) | doc/

branches/auto/mk/main.mk

@@ -13,7 +13,7 @@
 ######################################################################
 
 # The version number
-CFG_RELEASE_NUM=1.4.0
+CFG_RELEASE_NUM=1.3.0
 
 # An optional number to put after the label, e.g. '.2' -> '-beta.2'
 # NB Make sure it starts with a dot to conform to semver pre-release

branches/auto/mk/tests.mk

@@ -162,8 +162,7 @@ $(foreach doc,$(DOCS), \
   $(eval $(call DOCTEST,md-$(doc),$(S)src/doc/$(doc).md)))
 $(foreach file,$(wildcard $(S)src/doc/trpl/*.md), \
   $(eval $(call DOCTEST,$(file:$(S)src/doc/trpl/%.md=trpl-%),$(file))))
-$(foreach file,$(wildcard $(S)src/doc/nomicon/*.md), \
-  $(eval $(call DOCTEST,$(file:$(S)src/doc/nomicon/%.md=nomicon-%),$(file))))
+
 ######################################################################
 # Main test targets
 ######################################################################