---

yaml
---
r: 38811
b: refs/heads/incoming
c: dd76050
h: refs/heads/master
i:
  38809: f10d2f5
  38807: d529c44
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: a369a7881f2196e359fb9d4cb20cf5d2bb0da6f8
+refs/heads/incoming: dd76050e511ba367145b7debaac44687b9cdf9f1
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial-borrowed-ptr.md

@@ -698,7 +698,7 @@ is B, the function body. Both of the second two parameters `a` and `b`
 share the same lifetime, `r`, which is a lifetime parameter of
 `select_based_on_unit_circle()`. The caller will infer the
 intersection of these two lifetimes as the lifetime of the returned
-value, and hence the return value of `shape()` will be assigned a
+value, and hence the return value of `select()` will be assigned a
 lifetime of B. This will in turn lead to a compilation error, because
 `select_based_on_unit_circle()` is supposed to return a value with the
 lifetime `r`.

branches/incoming/mk/tests.mk

@@ -141,13 +141,13 @@ tidy:
 		@$(call E, check: formatting)
 		$(Q)find $(S)src -name '*.r[sc]' \
 		| grep '^$(S)src/test' -v \
-		| xargs -n 10 python $(S)src/etc/tidy.py
+		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
 		$(Q)find $(S)src/etc -name '*.py' \
-		| xargs -n 10 python $(S)src/etc/tidy.py
+		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
 		$(Q)echo $(ALL_CS) \
-	  	| xargs -n 10 python $(S)src/etc/tidy.py
+	  	| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
 		$(Q)echo $(ALL_HS) \
-	  	| xargs -n 10 python $(S)src/etc/tidy.py
+	  	| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
 
 endif
 

branches/incoming/src/libstd/sort.rs

@@ -921,6 +921,7 @@ mod test_tim_sort {
 
     #[test]
     #[should_fail]
+    #[cfg(unix)]
     fn crash_test() {
         let rng = rand::Rng();
         let mut arr = do vec::from_fn(1000) |_i| {