---

yaml
---
r: 78788
b: refs/heads/try
c: 521fb04
h: refs/heads/master
v: v3

Author: pnkfelix

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 25ed29a0edb3d48fef843a0b818ee68faf2252da
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 60fba4d7d677ec098e6a43014132fe99f7547363
-refs/heads/try: 6a649e6b8b3e42bb8fa8fa806d783ecd9b543784
+refs/heads/try: 521fb049be4642919d690a01ef8617a9508d3909
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -225,4 +225,19 @@ The initializer is `DEFAULT-TAB-WIDTH'.")
 
 (provide 'rust-mode)
 
+;; Issue #6887: Rather than inheriting the 'gnu compilation error
+;; regexp (which is broken on a few edge cases), add our own 'rust
+;; compilation error regexp and use it instead.
+(defvar rustc-compilation-regexps
+  (let ((re (concat "^\\([^ \n]+\\):\\([0-9]+\\):\\([0-9]+\\): "
+                    "\\([0-9]+\\):\\([0-9]+\\) "
+                    "\\(?:[Ee]rror\\|\\([Ww]arning\\)\\):")))
+    (cons re '(1 (2 . 4) (3 . 5) (6))))
+  "Specifications for matching errors in rustc invocations.
+See `compilation-error-regexp-alist for help on their format.")
+
+(add-to-list 'compilation-error-regexp-alist-alist
+             (cons 'rustc rustc-compilation-regexps))
+(add-to-list 'compilation-error-regexp-alist 'rustc)
+
 ;;; rust-mode.el ends here

branches/try/src/libextra/getopts.rs

@@ -689,9 +689,9 @@ pub mod groups {
                 }
             }
 
-            // FIXME: #5516 should be graphemes not codepoints
+            // FIXME: #5516
             // here we just need to indent the start of the description
-            let rowlen = row.char_len();
+            let rowlen = row.len();
             if rowlen < 24 {
                 do (24 - rowlen).times {
                     row.push_char(' ')
@@ -707,14 +707,14 @@ pub mod groups {
                 desc_normalized_whitespace.push_char(' ');
             }
 
-            // FIXME: #5516 should be graphemes not codepoints
+            // FIXME: #5516
             let mut desc_rows = ~[];
             do each_split_within(desc_normalized_whitespace, 54) |substr| {
                 desc_rows.push(substr.to_owned());
                 true
             };
 
-            // FIXME: #5516 should be graphemes not codepoints
+            // FIXME: #5516
             // wrapped description
             row.push_str(desc_rows.connect(desc_sep));
 
@@ -798,7 +798,7 @@ pub mod groups {
             cont
         };
 
-        ss.char_offset_iter().advance(|x| machine(x));
+        ss.iter().enumerate().advance(|x| machine(x));
 
         // Let the automaton 'run out' by supplying trailing whitespace
         while cont && match state { B | C => true, A => false } {
@@ -1580,31 +1580,4 @@ Options:
         debug!("generated: <<%s>>", usage);
         assert!(usage == expected)
     }
-
-    #[test]
-    fn test_groups_usage_description_multibyte_handling() {
-        let optgroups = ~[
-            groups::optflag("k", "k\u2013w\u2013",
-                "The word kiwi is normally spelled with two i's"),
-            groups::optflag("a", "apple",
-                "This \u201Cdescription\u201D has some characters that could \
-confuse the line wrapping; an apple costs 0.51€ in some parts of Europe."),
-        ];
-
-        let expected =
-~"Usage: fruits
-
-Options:
-    -k --k–w–           The word kiwi is normally spelled with two i's
-    -a --apple          This “description” has some characters that could
-                        confuse the line wrapping; an apple costs 0.51€ in
-                        some parts of Europe.
-";
-
-        let usage = groups::usage("Usage: fruits", optgroups);
-
-        debug!("expected: <<%s>>", expected);
-        debug!("generated: <<%s>>", usage);
-        assert!(usage == expected)
-    }
 }