Rollup of 3 pull requests

.mailmap

@@ -263,6 +263,7 @@ Xuefeng Wu <benewu@gmail.com> Xuefeng Wu <xfwu@thoughtworks.com>
 Xuefeng Wu <benewu@gmail.com> XuefengWu <benewu@gmail.com>
 York Xiang <bombless@126.com>
 Youngsoo Son <ysson83@gmail.com> <ysoo.son@samsung.com>
+Yuki Okushi <huyuumi.dev@gmail.com>
 Zach Pomerantz <zmp@umich.edu>
 Zack Corr <zack@z0w0.me> <zackcorr95@gmail.com>
 Zack Slayton <zack.slayton@gmail.com>

src/librustc_mir/borrow_check/universal_regions.rs

@@ -5,7 +5,7 @@
 //! fn foo<'a, 'b, 'c: 'b>() { }
 //! ```
 //!
-//! here we would be returning a map assigning each of `{'a, 'b, 'c}`
+//! here we would return a map assigning each of `{'a, 'b, 'c}`
 //! to an index, as well as the `FreeRegionMap` which can compute
 //! relationships between them.
 //!

src/libstd/env.rs

@@ -6,7 +6,7 @@
 //!
 //! There are several functions and structs in this module that have a
 //! counterpart ending in `os`. Those ending in `os` will return an [`OsString`]
-//! and those without will be returning a [`String`].
+//! and those without will return a [`String`].
 //!
 //! [`OsString`]: ../../std/ffi/struct.OsString.html
 //! [`String`]: ../string/struct.String.html

src/libsyntax_ext/deriving/generic/mod.rs

@@ -412,7 +412,8 @@ impl<'a> TraitDef<'a> {
                     _ => {
                         // Non-ADT derive is an error, but it should have been
                         // set earlier; see
-                        // libsyntax/ext/expand.rs:MacroExpander::expand()
+                        // libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
+                        // libsyntax_expand/base.rs:Annotatable::derive_allowed()
                         return;
                     }
                 };
@@ -486,7 +487,8 @@ impl<'a> TraitDef<'a> {
             _ => {
                 // Non-Item derive is an error, but it should have been
                 // set earlier; see
-                // libsyntax/ext/expand.rs:MacroExpander::expand()
+                // libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
+                // libsyntax_expand/base.rs:Annotatable::derive_allowed()
                 return;
             }
         }

src/libsyntax_ext/deriving/mod.rs

@@ -92,7 +92,8 @@ fn inject_impl_of_structural_trait(
         _ => {
             // Non-Item derive is an error, but it should have been
             // set earlier; see
-            // libsyntax/ext/expand.rs:MacroExpander::expand()
+            // libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
+            // libsyntax_expand/base.rs:Annotatable::derive_allowed()
             return;
         }
     };