Skip to content

Commit fab5c5c

Browse files
committed
---
yaml --- r: 145343 b: refs/heads/try2 c: 0716782 h: refs/heads/master i: 145341: 5f67f4e 145339: 2fb788e 145335: a4cb1e7 145327: ecb6e48 145311: c062934 145279: cd51bf9 v: v3
1 parent fd9443a commit fab5c5c

File tree

7 files changed

+322
-315
lines changed

7 files changed

+322
-315
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 695cb9fc2b1bb98a9affac3887806925f962c0aa
8+
refs/heads/try2: 07167826d6b7b30c96cc9d6227fbe01b65e980f8
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/configure

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,9 @@ do
845845

846846
# Disable unused LLVM features
847847
LLVM_OPTS="$LLVM_DBG_OPTS $LLVM_ASSERTION_OPTS --disable-docs --enable-bindings=none"
848+
# Disable term-info, linkage of which comes in multiple forms,
849+
# making our snapshots incompatible (#9334)
850+
LLVM_OPTS="$LLVM_OPTS --disable-terminfo"
848851

849852
case "$CFG_C_COMPILER" in
850853
("ccache clang")

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<keyword>assert</keyword>
4040
<keyword>break</keyword>
4141
<keyword>const</keyword>
42-
<keyword>copy</keyword>
4342
<keyword>do</keyword>
4443
<keyword>drop</keyword>
4544
<keyword>else</keyword>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<list name="keywords">
1919
<item> as </item>
2020
<item> break </item>
21-
<item> copy </item>
2221
<item> do </item>
2322
<item> drop </item>
2423
<item> else </item>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ syn keyword rustOperator as
1818

1919
syn match rustAssert "\<assert\(\w\)*!" contained
2020
syn match rustFail "\<fail\(\w\)*!" contained
21-
syn keyword rustKeyword break copy do extern
21+
syn keyword rustKeyword break do extern
2222
syn keyword rustKeyword in if impl let log
23-
syn keyword rustKeyword copy do extern
2423
syn keyword rustKeyword for impl let log
2524
syn keyword rustKeyword loop mod once priv pub
2625
syn keyword rustKeyword return

0 commit comments

Comments
 (0)