Merge pull request #26 from rust-lang/master

Sync to rust-lang/rust master

3 files changed, 16 insertions, 10 deletions

diff --git a/src/tools/clippy b/src/tools/clippy
-Subproject 58e01ea4d7df69e658c034afbfa6d0abd90808e
+Subproject 157edad6205fdd6a4f5932fba2675c619074635
diff --git a/src/tools/rls b/src/tools/rls
-Subproject d9aa23a43ad29e3a10551a1425ef5d5baef28d7
+Subproject 80a1d340f7d65b466bd3e0513c6b4b53498de2f
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index 50e9116c778..6d38cfc8630 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -307,7 +307,7 @@ fn collect_lang_features_in(base: &Path, file: &str, bad: &mut bool) -> Features
                 if prev_since > since {
                     tidy_error!(
                         bad,
-                        "{}:{}: feature {} is not sorted by since",
+                        "{}:{}: feature {} is not sorted by \"since\" (version number)",
                         path.display(),
                         line_number,
                         name,