---

yaml
---
r: 20758
b: refs/heads/snap-stage3
c: 4998a7d
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a413d4e502f36f25c57862d285a7f1211451f461
+refs/heads/snap-stage3: 4998a7dde8cb86c17263d95527c7d14c1f073043
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/doc/lib/codemirror-rust.js

@@ -4,7 +4,7 @@ CodeMirror.defineMode("rust", function() {
     "if": "if-style", "while": "if-style", "loop": "if-style", "else": "else-style",
     "do": "else-style", "ret": "else-style", "fail": "else-style",
     "break": "atom", "cont": "atom", "const": "let", "resource": "fn",
-    "let": "let", "fn": "fn", "for": "for", "alt": "alt", "iface": "iface",
+    "let": "let", "fn": "fn", "for": "for", "alt": "alt", "trait": "trait",
     "impl": "impl", "type": "type", "enum": "enum", "class": "atom", "mod": "mod",
     "as": "op", "true": "atom", "false": "atom", "assert": "op", "check": "op",
     "claim": "op", "extern": "ignore", "unsafe": "ignore", "import": "else-style",
@@ -179,7 +179,7 @@ CodeMirror.defineMode("rust", function() {
     if (type == "type") return cont(pushlex("stat"), tydef, endstatement, poplex, block);
     if (type == "enum") return stat_of(tagdef);
     if (type == "mod") return stat_of(mod);
-    if (type == "iface") return stat_of(iface);
+    if (type == "trait") return stat_of(trait);
     if (type == "impl") return stat_of(impl);
     if (type == "open-attr") return cont(pushlex("]"), commasep(expression, "]"), poplex);
     if (type == "ignore" || type.match(/[\]\);,]/)) return cont(block);
@@ -291,9 +291,9 @@ CodeMirror.defineMode("rust", function() {
     if (type == "{") return cont(pushlex("}"), block, poplex);
     return pass();
   }
-  function iface(type) {
-    if (type == "name") {cx.marked = "def"; return cont(iface);}
-    if (content == "<") return cont(typarams, iface);
+  function trait(type) {
+    if (type == "name") {cx.marked = "def"; return cont(trait);}
+    if (content == "<") return cont(typarams, trait);
     if (type == "{") return cont(pushlex("}"), block, poplex);
     return pass();
   }