---

yaml
---
r: 15431
b: refs/heads/try
c: 9e726b0
h: refs/heads/master
i:
  15429: 4f08686
  15427: 99f70a4
  15423: 08de5e2
v: v3

Author: graydon

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 2c93b1b2df6500ca52bd2f1ffb179acc0bf368c4
+refs/heads/try: 9e726b0461018abf6c9436e2dcd7b91cf1f15d97
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/configure

@@ -294,9 +294,7 @@ opt fast-make 0 "use .gitmodules as timestamp for submodule deps"
 opt manage-submodules 1 "let the build manage the git submodules"
 opt mingw-cross 0 "cross-compile for win32 using mingw"
 opt clang 0 "prefer clang to gcc for building the runtime"
-opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
 valopt prefix "/usr/local" "set installation prefix"
-valopt local-rust-root "/usr/local" "set prefix for local rust binary"
 valopt llvm-root "" "set LLVM root"
 valopt host-triple "${DEFAULT_HOST_TRIPLE}" "LLVM host triple"
 valopt target-triples "${CFG_HOST_TRIPLE}" "LLVM target triples"
@@ -339,6 +337,7 @@ probe CFG_XETEX            xetex
 probe CFG_LUATEX           luatex
 probe CFG_NODE             nodejs node
 
+
 if [ ! -z "$CFG_PANDOC" ]
 then
     PV=$(pandoc --version | awk '/^pandoc/ {print $2}')
@@ -349,14 +348,6 @@ then
     fi
 fi
 
-if [ ! -z "$CFG_ENABLE_LOCAL_RUST" -a ! -f ${CFG_LOCAL_RUST_ROOT}/bin/rustc ]
-then
-    err "no local rust to use"
-else
-    LRV=`${CFG_LOCAL_RUST_ROOT}/bin/rustc --version`
-    step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: " $LRV
-fi
-
 if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
 then
     err "either clang or gcc is required"
@@ -725,6 +716,7 @@ do
     putvar $CFG_LLVM_INST_DIR
 done
 
+
 # Munge any paths that appear in config.mk back to posix-y
 perl -i.bak -p -e 's@ ([a-zA-Z]):[/\\]@ /\1/@go;' \
                -e 's@\\@/@go;' config.tmp

branches/try/doc/tutorial.md

@@ -1476,6 +1476,13 @@ fn make_person(+name: str, +address: str) -> person {
 }
 ~~~~
 
+Finally there is by-move style, written `-`. This indicates that the
+function will take ownership of the argument, like with by-copy style,
+but a copy must not be made. The caller is (statically) obliged to not
+use the argument after the call; it is de-initialized as part of the
+call. This is used to support ownership-passing in the presence of
+non-copyable types.
+
 # Generics
 
 ## Generic functions

branches/try/mk/stage0.mk

@@ -1,18 +1,12 @@
 # Extract the snapshot host compiler
 
-
-
 $(HBIN0_H_$(CFG_HOST_TRIPLE))/rustc$(X):		\
 		$(S)src/snapshots.txt					\
 		$(S)src/etc/get-snapshot.py $(MKFILE_DEPS)
 	@$(call E, fetch: $@)
 #   Note: the variable "SNAPSHOT_FILE" is generally not set, and so
 #   we generally only pass one argument to this script.  
-ifdef CFG_ENABLE_LOCAL_RUST
-	$(Q)$(S)src/etc/local_stage0.sh $(CFG_HOST_TRIPLE) $(CFG_LOCAL_RUST_ROOT)
-else 
 	$(Q)$(S)src/etc/get-snapshot.py $(CFG_HOST_TRIPLE) $(SNAPSHOT_FILE)
-endif 
 	$(Q)touch $@
 
 # Host libs will be extracted by the above rule