---

yaml
---
r: 80687
b: refs/heads/try
c: de79972
h: refs/heads/master
i:
  80685: 90d135d
  80683: f49dc72
  80679: b194600
  80671: 8a2bc4e
v: v3

Author: Jakub

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
-refs/heads/try: 91ab8a3f529e8b6735e0c8a998dc78667cabe40e
+refs/heads/try: de799722dc057107a2601a4e8ff6ff08f3a8b16f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/doc/rust.md

@@ -2459,12 +2459,25 @@ do k(3) |j| {
 ### For expressions
 
 ~~~~~~~~{.ebnf .gram}
-for_expr : "for" pat "in" expr '{' block '}' ;
+for_expr : "for" expr [ '|' ident_list '|' ] ? '{' block '}' ;
 ~~~~~~~~
 
-A `for` expression is a syntactic construct for looping
-over elements provided by an implementation of
-`std::iterator::Iterator`.
+A _for expression_ is similar to a [`do` expression](#do-expressions),
+in that it provides a special block-form of lambda expression,
+suited to passing the `block` function to a higher-order function implementing a loop.
+
+In contrast to a `do` expression, a `for` expression is designed to work
+with methods such as `each` and `times`, that require the body block to
+return a boolean. The `for` expression accommodates this by implicitly
+returning `true` at the end of each block, unless a `break` expression
+is evaluated.
+
+In addition, [`break`](#break-expressions) and [`loop`](#loop-expressions) expressions
+are rewritten inside `for` expressions in the same way that `return` expressions are,
+with a combination of local flag variables,
+and early boolean-valued returns from the `block` function,
+such that the meaning of `break` and `loop` is preserved in a primitive loop
+when rewritten as a `for` loop controlled by a higher order function.
 
 An example of a for loop over the contents of a vector:
 

branches/try/doc/tutorial-container.md

@@ -200,7 +200,7 @@ for i in range(0, 5) {
   printf!("%d ", i) // prints "0 1 2 3 4"
 }
 
-for i in std::iter::range_inclusive(0, 5) { // needs explicit import
+for i in std::iterator::range_inclusive(0, 5) { // needs explicit import
   printf!("%d ", i) // prints "0 1 2 3 4 5"
 }
 ~~~

branches/try/mk/rt.mk

@@ -176,9 +176,9 @@ LIBUV_NO_LOAD = run-benchmarks.target.mk run-tests.target.mk \
 
 export PYTHONPATH := $(PYTHONPATH):$$(S)src/gyp/pylib
 
-$$(LIBUV_MAKEFILE_$(1)_$(2)): $$(LIBUV_DEPS)
+$$(LIBUV_MAKEFILE_$(1)_$(2)):
 	(cd $(S)src/libuv/ && \
-	 $$(CFG_PYTHON) ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja \
+	 ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja \
 	   -Goutput_dir=$$(@D) --generator-output $$(@D))
 
 # XXX: Shouldn't need platform-specific conditions here

branches/try/src/etc/emacs/README.md

@@ -68,12 +68,6 @@ marking, press x, and ELPA will install the packages for you (under
 
 * or using <kbd>M-x package-install rust-mode
 
-### Tests via ERT
-
-The file `rust-mode-tests.el` contains tests that can be run via ERT.  You can
-use `run_rust_emacs_tests.sh` to run them in batch mode, if emacs is somewhere
-in your `$PATH`.
-
 ### Known bugs
 
 * Combining `global-whitespace-mode` and `rust-mode` is generally glitchy.