Skip to content

Commit d079db9

Browse files
committed
---
yaml --- r: 110447 b: refs/heads/try c: b6d5daf h: refs/heads/master i: 110445: 6cd6f2f 110443: 54d0a45 110439: e298578 110431: 2c2799d v: v3
1 parent 51cbce4 commit d079db9

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: e415c25bcd81dc1f9a5a3d25d9b48ed2d545336b
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: c7fac4471201977fdb1c0c0a26c87287e12dc644
5-
refs/heads/try: 2eccb1d0c241b2ad67d0cdadc66bbc45e9f6e290
5+
refs/heads/try: b6d5dafea58c7f8f254333d53fe6b4b8ee8763e3
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/etc/emacs/rust-mode.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
;; but the "else" or "{" should align with the beginning
123123
;; of the expression it's in.)
124124
(looking-at "\\<else\\>\\|{")
125-
125+
126126
(save-excursion
127127
(rust-rewind-irrelevant)
128128
;; Point is now at the end of the previous ine

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
</context>
283283

284284
<context id="attribute" style-ref="attribute" class="attribute">
285-
<start extended="true">\#\[</start>
285+
<start extended="true">\#!?\[</start>
286286
<end>\]</end>
287287
<include>
288288
<context ref="def:in-comment"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@
202202
<RegExpr String="[0-9][0-9_]*\.[0-9_]*([eE][+-]?[0-9_]+)?(f32|f64|f)?" attribute="Number" context="#stay"/>
203203
<RegExpr String="[0-9][0-9_]*&rustIntSuf;" attribute="Number" context="#stay"/>
204204
<Detect2Chars char="#" char1="[" attribute="Attribute" context="Attribute" beginRegion="Attribute"/>
205+
<Detect2Chars char="#" char1="!" char2="[" attribute="Attribute" context="Attribute" beginRegion="Attribute"/>
205206
<RegExpr String="&rustIdent;::" attribute="Scope"/>
206207
<RegExpr String="&rustIdent;!" attribute="Macro"/>
207208
<RegExpr String="&apos;&rustIdent;(?!&apos;)" attribute="Lifetime"/>

0 commit comments

Comments
 (0)