Minor message updates for 1.35/1.36.

Author: ehuss

rust/levels.py

@@ -41,6 +41,10 @@ def __repr__(self):
     'warning': Level(1, 'warning', 'warnings'),
     'note': Level(2, 'note', 'notes'),
     'help': Level(3, 'help', 'help'),
+    # This is "FailureNote", see https://github.com/rust-lang/rust/issues/60425.
+    # Currently we filter all these out ("For more information..."), but
+    # handle it just in case new ones are added.
+    '': Level(4, 'note', 'note'),
 }
 
 

rust/messages.py

@@ -837,9 +837,8 @@ def _collect_rust_messages(window, base_path, info, target_path,
     - `info`: The dictionary from Rust has the following structure:
 
         - 'message': The message to display.
-        - 'level': The error level ('error', 'warning', 'note', 'help')
-                   (XXX I think an ICE shows up as 'error: internal compiler
-                   error')
+        - 'level': The error level ('error', 'warning', 'note', 'help', ''
+          (for FailureNote), 'error: internal compiler error')
         - 'code': If not None, contains a dictionary of extra information
           about the error.
             - 'code': String like 'E0001'
@@ -964,6 +963,7 @@ def add_additional(span, text, level, suggested_replacement=None):
             if not (imsg.startswith('aborting due to') or
                     imsg.startswith('cannot continue') or
                     imsg.startswith('Some errors occurred') or
+                    imsg.startswith('Some errors have detailed') or
                     imsg.startswith('For more information about')):
                 if target_path:
                     # Display at the bottom of the root path (like main.rs)

tests/error-tests/benches/bench_err.rs

@@ -5,4 +5,5 @@
 // ^^^^^^^ERR(<1.30.0-beta) The attribute `asdf` is currently unknown
 //   ^^^^ERR(>=1.30.0-beta) The attribute `asdf` is currently unknown
 //   ^^^^HELP(nightly) add #![feature(custom_attribute)]
+//   ^^^^NOTE(>=1.36.0-beta) for more information
 fn f() {}