From decb9592ac7e4409ae83db29ef9e444efacf1897 Mon Sep 17 00:00:00 2001 From: Donough Liu Date: Sat, 21 Dec 2019 20:22:46 +0800 Subject: [PATCH 1/3] Fix outdated comment Logics in libsyntax/ext/expand.rs:MacroExpander::expand() have moved to libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment() --- src/libsyntax_ext/deriving/generic/mod.rs | 6 ++++-- src/libsyntax_ext/deriving/mod.rs | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 5fecd13db9895..026277413b0f5 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -410,7 +410,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; } }; @@ -461,7 +462,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; } } diff --git a/src/libsyntax_ext/deriving/mod.rs b/src/libsyntax_ext/deriving/mod.rs index a98cce1fd61c1..db61eef01fcd1 100644 --- a/src/libsyntax_ext/deriving/mod.rs +++ b/src/libsyntax_ext/deriving/mod.rs @@ -89,7 +89,8 @@ fn inject_impl_of_structural_trait(cx: &mut ExtCtxt<'_>, _ => { // 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; } }; From e850cfc6bb5bdfe85c72979172862432644b4636 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sat, 28 Dec 2019 16:51:35 +0900 Subject: [PATCH 2/3] Update .mailmap --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 3e512377d0377..8b5e9f96b3d8d 100644 --- a/.mailmap +++ b/.mailmap @@ -263,6 +263,7 @@ Xuefeng Wu Xuefeng Wu Xuefeng Wu XuefengWu York Xiang Youngsoo Son +Yuki Okushi Zach Pomerantz Zack Corr Zack Slayton From 9ec924c97df970be1d7992df74206c149490b066 Mon Sep 17 00:00:00 2001 From: Matthew Kraai Date: Sat, 28 Dec 2019 07:05:44 -0800 Subject: [PATCH 3/3] Change "be returning" to "return" --- src/librustc_mir/borrow_check/universal_regions.rs | 2 +- src/libstd/env.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustc_mir/borrow_check/universal_regions.rs b/src/librustc_mir/borrow_check/universal_regions.rs index 141289bd2b2d3..4e3aa4c65b6a8 100644 --- a/src/librustc_mir/borrow_check/universal_regions.rs +++ b/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. //! diff --git a/src/libstd/env.rs b/src/libstd/env.rs index 60facd9f8d468..13fe3bda525ae 100644 --- a/src/libstd/env.rs +++ b/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