---

yaml
---
r: 54111
b: refs/heads/dist-snap
c: 8604165
h: refs/heads/master
i:
  54109: a49846c
  54107: ab048d5
  54103: 0cfbdde
  54095: 7ff99fc
  54079: 7a93206
v: v3

Author: apasel422

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 2911fc29d03bcabd6e55171e260291b33465cb5c
+refs/heads/dist-snap: 8604165871d2744ea762f762c95d4aef66e8eba0
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/configure

@@ -536,7 +536,6 @@ fi
 CFG_PREFIX=${CFG_PREFIX%/}
 CFG_HOST_TRIPLES="$(echo $CFG_HOST_TRIPLES | tr ',' ' ')"
 CFG_TARGET_TRIPLES="$(echo $CFG_TARGET_TRIPLES | tr ',' ' ')"
-CFG_SUPPORTED_TARGET_TRIPLES="$(grep ^CC_*=* $CFG_SRC_DIR/mk/platform.mk | sed 's,^[^_]*_,,' | sed 's/\([^=]*\).*/\1/' | xargs)"
 
 # copy host-triples to target-triples so that hosts are a subset of targets
 V_TEMP=""
@@ -549,22 +548,8 @@ CFG_TARGET_TRIPLES=$V_TEMP
 # check target-specific tool-chains
 for i in $CFG_TARGET_TRIPLES
 do
-    L_CHECK=false
-    for j in $CFG_SUPPORTED_TARGET_TRIPLES
-    do
-        if [ $i = $j ]
-        then
-            L_CHECK=true
-        fi
-    done
-
-    if [ $L_CHECK = false ]
-    then
-        err "unsupported target triples \"$i\" found"
-    fi
-
     case $i in
-        arm-linux-androideabi)
+        arm-unknown-android)
 
             if [ ! -f $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-gcc ]
             then

branches/dist-snap/src/etc/kate/rust.xml

@@ -18,7 +18,6 @@
 	<list name="keywords">
 		<item> as </item>
 		<item> break </item>
-		<item> const </item>
 		<item> copy </item>
 		<item> do </item>
 		<item> drop </item>
@@ -29,18 +28,17 @@
 		<item> if </item>
 		<item> impl </item>
 		<item> let </item>
-		<item> log </item>
 		<item> loop </item>
 		<item> match </item>
 		<item> mod </item>
 		<item> mut </item>
 		<item> priv </item>
 		<item> pub </item>
-		<item> pure </item>
 		<item> ref </item>
 		<item> return </item>
 		<item> static </item>
 		<item> struct </item>
+		<item> super </item>
 		<item> trait </item>
 		<item> unsafe </item>
 		<item> use </item>