---

yaml
---
r: 82520
b: refs/heads/auto
c: 72633a2
h: refs/heads/master
v: v3

Author: bytbox

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: d72e3328aca3a4331e650ab800409b2b6551b339
+refs/heads/auto: 72633a2af25e0155ca9952a635f7a52d0c88bf00
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/configure

@@ -845,9 +845,6 @@ do
 
         # Disable unused LLVM features
         LLVM_OPTS="$LLVM_DBG_OPTS $LLVM_ASSERTION_OPTS --disable-docs --enable-bindings=none"
-        # Disable term-info, linkage of which comes in multiple forms,
-        # making our snapshots incompatible (#9334)
-        LLVM_OPTS="$LLVM_OPTS --disable-terminfo"
 
         case "$CFG_C_COMPILER" in
             ("ccache clang")

branches/auto/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang

@@ -39,7 +39,6 @@
 		<keyword>assert</keyword>
 		<keyword>break</keyword>
 		<keyword>const</keyword>
-		<keyword>copy</keyword>
 		<keyword>do</keyword>
 		<keyword>drop</keyword>
 		<keyword>else</keyword>

branches/auto/src/etc/kate/rust.xml

@@ -18,7 +18,6 @@
 	<list name="keywords">
 		<item> as </item>
 		<item> break </item>
-		<item> copy </item>
 		<item> do </item>
 		<item> drop </item>
 		<item> else </item>

branches/auto/src/etc/vim/syntax/rust.vim

@@ -18,9 +18,8 @@ syn keyword   rustOperator    as
 
 syn match     rustAssert      "\<assert\(\w\)*!" contained
 syn match     rustFail        "\<fail\(\w\)*!" contained
-syn keyword   rustKeyword     break copy do extern
+syn keyword   rustKeyword     break do extern
 syn keyword   rustKeyword     in if impl let log
-syn keyword   rustKeyword     copy do extern
 syn keyword   rustKeyword     for impl let log
 syn keyword   rustKeyword     loop mod once priv pub
 syn keyword   rustKeyword     return