Skip to content

Commit eab33e5

Browse files
committed
---
yaml --- r: 44279 b: refs/heads/snap-stage3 c: 4b9b328 h: refs/heads/master i: 44277: 7fb35ef 44275: 9879982 44271: 94f84c7 v: v3
1 parent 590c8d3 commit eab33e5

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 4bf94a7b30eeebd820a341890f05e5b709a6d2f2
4+
refs/heads/snap-stage3: 4b9b32839e6693d6009528658d282f69777d972e
55
refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/etc/emacs/rust-mode.el

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,22 @@
6666
"trait" "struct" "fn" "enum"
6767
"impl"))
6868
(puthash word 'def table))
69-
(dolist (word '("as" "break"
70-
"copy" "do" "drop" "else"
71-
"extern" "for" "if" "let" "log"
72-
"loop" "once" "priv" "pub" "pure"
73-
"ref" "return" "static" "unsafe" "use"
74-
"while" "while"
75-
"assert"
76-
"mut"))
69+
(dolist (word '("again" "assert"
70+
"break"
71+
"copy"
72+
"do" "drop"
73+
"else" "export" "extern"
74+
"fail" "for"
75+
"if" "use"
76+
"let" "log" "loop"
77+
"move" "new"
78+
"pure" "pub" "priv"
79+
"ref" "return" "static"
80+
"unchecked" "unsafe"
81+
"while"))
7782
(puthash word t table))
7883
(puthash "match" 'alt table)
79-
(dolist (word '("self" "true" "false")) (puthash word 'atom table))
84+
(dolist (word '("true" "false")) (puthash word 'atom table))
8085
table))
8186
;; FIXME type-context keywords
8287

branches/snap-stage3/src/etc/x86.supp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,13 @@
422422
...
423423
}
424424

425+
{
426+
enum-instruction-scheduling-9
427+
Memcheck:Cond
428+
fun:*get_authority*
429+
...
430+
}
431+
425432
{
426433
llvm-user-new-leak
427434
Memcheck:Leak

0 commit comments

Comments
 (0)