about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2016-03-19 12:30:00 +0200
committerEduard-Mihai Burtescu <edy.burt@gmail.com>2016-03-19 12:30:00 +0200
commite28a1b6cf56d6546d856a332c86c3b7aa75de366 (patch)
tree13ee4496e72bbc063ea60377eea590eeff021f6f
parent8be1d7d1a93d049e45a94edf956f3968d5a454d0 (diff)
parent6ed7846257af7c2da9d2164916eb8fe150b50ec2 (diff)
downloadrust-e28a1b6cf56d6546d856a332c86c3b7aa75de366.tar.gz
rust-e28a1b6cf56d6546d856a332c86c3b7aa75de366.zip
Rollup merge of #32271 - frewsxcv:compiletest-ignored-help-note, r=nikomatsakis
Add comment about opt-in nature of compiletest note/help messages.

The opt-in functionality was proposed and discussed in
https://github.com/rust-lang/rust/issues/21195
-rw-r--r--src/compiletest/runtest.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index e3ced9eff3e..5af70e53125 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -1025,6 +1025,10 @@ fn check_expected_errors(revision: Option<&str>,
         expected.replace(r"\", "/")
     }).collect::<Vec<String>>();
 
+    // If the testcase being checked contains at least one expected "help"
+    // message, then we'll ensure that all "help" messages are expected.
+    // Otherwise, all "help" messages reported by the compiler will be ignored.
+    // This logic also applies to "note" messages.
     let (expect_help, expect_note) =
         expected_errors.iter()
                         .fold((false, false),