Auto merge of #39248 - Wilfred:patch-1, r=frewsxcv

Adding missing URL to release notes

diff --git a/src/doc/reference.md b/src/doc/reference.md
index 938a74a16219ce8f8d8c28111baa202f6445459c..dfdfe328820289cdbd284c71e8146ac2b6d0fed7 100644 (file)
--- a/src/doc/reference.md
+++ b/src/doc/reference.md
@@ -659,7 +659,7 @@ thing they can be used for is to implement derive on your own types. See
 Procedural macros involve a few different parts of the language and its
 standard libraries. First is the `proc_macro` crate, included with Rust,
 that defines an interface for building a procedural macro. The
-`#[proc_macro_derive(Foo)]` attribute is used to mark the the deriving
+`#[proc_macro_derive(Foo)]` attribute is used to mark the deriving
 function. This function must have the type signature:
 
 ```rust,ignore

diff --git a/src/librustc/ty/trait_def.rs b/src/librustc/ty/trait_def.rs
index c6d862b23bd5e393fc2bc67da607d37c730e7e7d..1dc494ca277b309e3ef0bb81f2f19688a9da2609 100644 (file)
--- a/src/librustc/ty/trait_def.rs
+++ b/src/librustc/ty/trait_def.rs
@@ -26,7 +26,7 @@ pub struct TraitDef {
 
     /// If `true`, then this trait had the `#[rustc_paren_sugar]`
     /// attribute, indicating that it should be used with `Foo()`
-    /// sugar. This is a temporary thing -- eventually any trait wil
+    /// sugar. This is a temporary thing -- eventually any trait will
     /// be usable with the sugar (or without it).
     pub paren_sugar: bool,
 

diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index 0ecd12b3a903aff65a8b4bc900039752ba57b84d..ad2aefbb79539c60b4ffa943ee4bc357142c4364 100644 (file)
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -904,7 +904,7 @@ fn print_flag_list<T>(cmdline_opt: &str,
 /// should continue, returns a getopts::Matches object parsed from args,
 /// otherwise returns None.
 ///
-/// The compiler's handling of options is a little complication as it ties into
+/// The compiler's handling of options is a little complicated as it ties into
 /// our stability story, and it's even *more* complicated by historical
 /// accidents. The current intention of each compiler option is to have one of
 /// three modes:

diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index f540dc3d3e6ad9da782f7f222d2c0fb0961ad5fb..ee8113e80e5752dd5284ac10a85cb0d32a07aed5 100644 (file)
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -115,9 +115,10 @@ pub fn check(path: &Path, bad: &mut bool) {
         }
     });
 
-    super::walk(&path.join("test/compile-fail"),
-                &mut |path| super::filter_dirs(path),
-                &mut |file| {
+    super::walk_many(&[&path.join("test/compile-fail"),
+                       &path.join("test/compile-fail-fulldeps")],
+                     &mut |path| super::filter_dirs(path),
+                     &mut |file| {
         let filename = file.file_name().unwrap().to_string_lossy();
         if !filename.ends_with(".rs") || filename == "features.rs" ||
            filename == "diagnostic_list.rs" {
@@ -170,7 +171,7 @@ pub fn check(path: &Path, bad: &mut bool) {
         "cfg_target_has_atomic", "staged_api", "const_indexing",
         "unboxed_closures", "stmt_expr_attributes",
         "cfg_target_thread_local", "unwind_attributes",
-        "inclusive_range_syntax", "proc_macro"
+        "inclusive_range_syntax"
     ];
 
     // Only check the number of lang features.

diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
index 7566580b1a5f2f904317c98d6a424c7d38bb8e33..9962c6ec9af12209c560d9d2c9edccc1e45b2151 100644 (file)
--- a/src/tools/tidy/src/main.rs
+++ b/src/tools/tidy/src/main.rs
@@ -71,6 +71,11 @@ fn filter_dirs(path: &Path) -> bool {
     skip.iter().any(|p| path.ends_with(p))
 }
 
+fn walk_many(paths: &[&Path], skip: &mut FnMut(&Path) -> bool, f: &mut FnMut(&Path)) {
+    for path in paths {
+        walk(path, skip, f);
+    }
+}
 
 fn walk(path: &Path, skip: &mut FnMut(&Path) -> bool, f: &mut FnMut(&Path)) {
     for entry in t!(fs::read_dir(path), path) {