---

yaml
---
r: 175761
b: refs/heads/auto
c: 612ded7
h: refs/heads/master
i:
  175759: d54f1e2
v: v3

Author: michaelwoerister

[refs]

@@ -10,7 +10,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: d15192317aa025ff06faa56ca00950fb7ce6ff4b
+refs/heads/auto: 612ded78e3275332e4b68391701a2866ca3689cc
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/configure

@@ -28,8 +28,8 @@ need_ok() {
 
 need_cmd() {
     if command -v $1 >/dev/null 2>&1
-    then msg "found program $1"
-    else err "need program $1"
+    then msg "found $1"
+    else err "need $1"
     fi
 }
 
@@ -340,7 +340,6 @@ need_cmd date
 need_cmd tr
 need_cmd sed
 need_cmd file
-need_cmd make
 
 msg "inspecting environment"
 
@@ -646,8 +645,6 @@ probe CFG_ISCC             iscc
 probe CFG_JAVAC            javac
 probe CFG_ANTLR4           antlr4
 probe CFG_GRUN             grun
-probe CFG_FLEX             flex
-probe CFG_BISON            bison
 probe CFG_PANDOC           pandoc
 probe CFG_PDFLATEX         pdflatex
 probe CFG_XELATEX          xelatex

branches/auto/mk/grammar.mk

@@ -14,11 +14,6 @@ B = $(CFG_BUILD_DIR)/$(CFG_BUILD)/stage2/
 L = $(B)lib/rustlib/$(CFG_BUILD)/lib
 LD = $(CFG_BUILD)/stage2/lib/rustlib/$(CFG_BUILD)/lib/
 RUSTC = $(STAGE2_T_$(CFG_BUILD)_H_$(CFG_BUILD))
-ifeq ($(CFG_OSTYPE),apple-darwin)
-	FLEX_LDFLAGS=-ll
-else
-	FLEX_LDFLAGS=-lfl
-endif
 
 # Run the reference lexer against libsyntax and compare the tokens and spans.
 # If "// ignore-lexer-test" is present in the file, it will be ignored.
@@ -72,46 +67,3 @@ $(info cfg: javac not available, skipping lexer test...)
 check-lexer:
 
 endif
-
-$(BG)lex.yy.c: $(SG)lexer.l $(BG)
-	@$(call E, flex: $@)
-	$(Q)$(CFG_FLEX) -o $@ $<
-
-$(BG)lexer-lalr.o: $(BG)lex.yy.c $(BG)parser-lalr.tab.h
-	@$(call E, cc: $@)
-	$(Q)$(CFG_CC) -include $(BG)parser-lalr.tab.h -c -o $@ $<
-
-$(BG)parser-lalr.tab.c $(BG)parser-lalr.tab.h: $(SG)parser-lalr.y
-	@$(call E, bison: $@)
-	$(Q)$(CFG_BISON) $< --output=$(BG)parser-lalr.tab.c --defines=$(BG)parser-lalr.tab.h \
-		--name-prefix=rs --warnings=error=all
-
-$(BG)parser-lalr.o: $(BG)parser-lalr.tab.c
-	@$(call E, cc: $@)
-	$(Q)$(CFG_CC) -c -o $@ $<
-
-$(BG)parser-lalr-main.o: $(SG)parser-lalr-main.c
-	@$(call E, cc: $@)
-	$(Q)$(CFG_CC) -std=c99 -c -o $@ $<
-
-$(BG)parser-lalr: $(BG)parser-lalr.o $(BG)parser-lalr-main.o $(BG)lexer-lalr.o
-	@$(call E, cc: $@)
-	$(Q)$(CFG_CC) -o $@ $^ $(FLEX_LDFLAGS)
-
-
-ifdef CFG_FLEX
-ifdef CFG_BISON
-check-grammar: $(BG) $(BG)parser-lalr
-	$(info Verifying grammar ...)
-	$(SG)testparser.py -p $(BG)parser-lalr -s $(S)src
-
-else
-$(info cfg: bison not available, skipping parser test...)
-check-grammar:
-
-endif
-else
-$(info cfg: flex not available, skipping parser test...)
-check-grammar:
-
-endif

branches/auto/mk/main.mk

@@ -30,8 +30,8 @@ CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)
 CFG_DISABLE_UNSTABLE_FEATURES=1
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),beta)
-CFG_RELEASE=$(CFG_RELEASE_NUM)-beta$(CFG_PRERELEASE_VERSION)
-CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-beta$(CFG_PRERELEASE_VERSION)
+CFG_RELEASE=$(CFG_RELEASE_NUM)-beta(CFG_PRERELEASE_VERSION)
+CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-beta(CFG_PRERELEASE_VERSION)
 CFG_DISABLE_UNSTABLE_FEATURES=1
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),nightly)

branches/auto/src/compiletest/common.rs

@@ -12,20 +12,6 @@ pub use self::Mode::*;
 use std::fmt;
 use std::str::FromStr;
 
-#[cfg(stage0)] // NOTE: remove impl after snapshot
-#[derive(Clone, PartialEq, Show)]
-pub enum Mode {
-    CompileFail,
-    RunFail,
-    RunPass,
-    RunPassValgrind,
-    Pretty,
-    DebugInfoGdb,
-    DebugInfoLldb,
-    Codegen
-}
-
-#[cfg(not(stage0))] // NOTE: remove cfg after snapshot
 #[derive(Clone, PartialEq, Debug)]
 pub enum Mode {
     CompileFail,
@@ -38,7 +24,6 @@ pub enum Mode {
     Codegen
 }
 
-
 impl Copy for Mode {}
 
 impl FromStr for Mode {

branches/auto/src/doc/reference.md

@@ -2291,7 +2291,136 @@ The name `str_eq` has a special meaning to the Rust compiler, and the presence
 of this definition means that it will use this definition when generating calls
 to the string equality function.
 
-A complete list of the built-in language items will be added in the future.
+A complete list of the built-in language items follows:
+
+#### Built-in Traits
+
+* `copy`
+  : Types that do not move ownership when used by-value.
+* `drop`
+  : Have destructors.
+* `send`
+  : Able to be sent across thread boundaries.
+* `sized`
+  : Has a size known at compile time.
+* `sync`
+  : Able to be safely shared between threads when aliased.
+
+#### Operators
+
+These language items are traits:
+
+* `add`
+  : Elements can be added (for example, integers and floats).
+* `sub`
+  : Elements can be subtracted.
+* `mul`
+  : Elements can be multiplied.
+* `div`
+  : Elements have a division operation.
+* `rem`
+  : Elements have a remainder operation.
+* `neg`
+  : Elements can be negated arithmetically.
+* `not`
+  : Elements can be negated logically.
+* `bitxor`
+  : Elements have an exclusive-or operation.
+* `bitand`
+  : Elements have a bitwise `and` operation.
+* `bitor`
+  : Elements have a bitwise `or` operation.
+* `shl`
+  : Elements have a left shift operation.
+* `shr`
+  : Elements have a right shift operation.
+* `index`
+  : Elements can be indexed.
+* `index_mut`
+  : ___Needs filling in___
+* `eq`
+  : Elements can be compared for equality.
+* `ord`
+  : Elements have a partial ordering.
+* `deref`
+  : `*` can be applied, yielding a reference to another type.
+* `deref_mut`
+  : `*` can be applied, yielding a mutable reference to another type.
+
+These are functions:
+
+* `fn`
+  : ___Needs filling in___
+* `fn_mut`
+  : ___Needs filling in___
+* `fn_once`
+  : ___Needs filling in___
+* `str_eq`
+  : Compare two strings (`&str`) for equality.
+* `strdup_uniq`
+  : Return a new unique string
+    containing a copy of the contents of a unique string.
+
+#### Types
+
+* `type_id`
+  : The type returned by the `type_id` intrinsic.
+* `unsafe`
+  : A type whose contents can be mutated through an immutable reference.
+
+#### Marker types
+
+These types help drive the compiler's analysis
+
+* `begin_unwind`
+  : ___Needs filling in___
+* `no_copy_bound`
+  : This type does not implement "copy", even if eligible.
+* `eh_personality`
+  : ___Needs filling in___
+* `exchange_free`
+  : Free memory that was allocated on the exchange heap.
+* `exchange_malloc`
+  : Allocate memory on the exchange heap.
+* `closure_exchange_malloc`
+  : ___Needs filling in___
+* `panic`
+  : Abort the program with an error.
+* `fail_bounds_check`
+  : Abort the program with a bounds check error.
+* `free`
+  : Free memory that was allocated on the managed heap.
+* `gc`
+  : ___Needs filling in___
+* `exchange_heap`
+  : ___Needs filling in___
+* `iterator`
+  : ___Needs filling in___
+* `contravariant_lifetime`
+  : The lifetime parameter should be considered contravariant.
+* `covariant_lifetime`
+  : The lifetime parameter should be considered covariant.
+* `invariant_lifetime`
+  : The lifetime parameter should be considered invariant.
+* `malloc`
+  : Allocate memory on the managed heap.
+* `owned_box`
+  : ___Needs filling in___
+* `stack_exhausted`
+  : ___Needs filling in___
+* `start`
+  : ___Needs filling in___
+* `contravariant_type`
+  : The type parameter should be considered contravariant.
+* `covariant_type`
+  : The type parameter should be considered covariant.
+* `invariant_type`
+  : The type parameter should be considered invariant.
+* `ty_desc`
+  : ___Needs filling in___
+
+> **Note:** This list is likely to become out of date. We should auto-generate
+> it from `librustc/middle/lang_items.rs`.
 
 ### Inline attributes
 
@@ -2523,7 +2652,9 @@ The currently implemented features of the reference compiler are:
                    declare a `static` as being unique per-thread leveraging
                    LLVM's implementation which works in concert with the kernel
                    loader and dynamic linker. This is not necessarily available
-                   on all platforms, and usage of it is discouraged.
+                   on all platforms, and usage of it is discouraged (rust
+                   focuses more on thread-local data instead of thread-local
+                   data).
 
 * `trace_macros` - Allows use of the `trace_macros` macro, which is a nasty
                    hack that will certainly be removed.

branches/auto/src/doc/trpl/installing-rust.md

@@ -83,6 +83,7 @@ If not, there are a number of places where you can get help. The easiest is
 you can access through
 [Mibbit](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust). Click
 that link, and you'll be chatting with other Rustaceans (a silly nickname we
-call ourselves), and we can help you out. Other great resources include [the
-/r/rust subreddit](http://www.reddit.com/r/rust), and [Stack
+call ourselves), and we can help you out. Other great resources include [our
+forum](http://discuss.rust-lang.org/), [the /r/rust
+subreddit](http://www.reddit.com/r/rust), and [Stack
 Overflow](http://stackoverflow.com/questions/tagged/rust).