Auto merge of #59760 - Centril:rollup-4b9x7ue, r=Centril

bors · bors · commit 091380021a8f · 2019-04-06T21:34:12.000Z
Rollup of 5 pull requests Successful merges: - #59738 (Move match_path from DefId to lint::LateContext) - #59740 (Use for_each to extend collections) - #59751 (Tiny docs fix) - #59754 (Update books) - #59755 (Update miri) Failed merges: r? @ghost
diff --git a/src/doc/embedded-book b/src/doc/embedded-book
@@ -1 +1 @@
-Subproject commit 07fd3880ea0874d82b1d9ed30ad3427ec98b4e8a
+Subproject commit 7989c723607ef5b13b57208022259e6c771e11d0
diff --git a/src/doc/nomicon b/src/doc/nomicon
@@ -1 +1 @@
-Subproject commit f1ff93b66844493a7b03101c7df66ac958c62418
+Subproject commit c02e0e7754a76886e55b976a3a4fac20100cd35d
diff --git a/src/doc/reference b/src/doc/reference
@@ -1 +1 @@
-Subproject commit 27ad493a10364e907ec476e2ad61e8a1614b57e1
+Subproject commit 98f90ff4de8e588f651f0fb493b5c7496551cd59
diff --git a/src/liballoc/collections/binary_heap.rs b/src/liballoc/collections/binary_heap.rs
@@ -1177,9 +1177,7 @@ impl<T: Ord> BinaryHeap<T> {
 
         self.reserve(lower);
 
-        for elem in iterator {
-            self.push(elem);
-        }
+        iterator.for_each(move |elem| self.push(elem));
     }
 }
 
diff --git a/src/liballoc/collections/btree/map.rs b/src/liballoc/collections/btree/map.rs
@@ -1727,9 +1727,9 @@ impl<K: Ord, V> FromIterator<(K, V)> for BTreeMap<K, V> {
 impl<K: Ord, V> Extend<(K, V)> for BTreeMap<K, V> {
     #[inline]
     fn extend<T: IntoIterator<Item = (K, V)>>(&mut self, iter: T) {
-        for (k, v) in iter {
+        iter.into_iter().for_each(move |(k, v)| {
             self.insert(k, v);
-        }
+        });
     }
 }
 
diff --git a/src/liballoc/collections/btree/set.rs b/src/liballoc/collections/btree/set.rs
@@ -883,9 +883,9 @@ impl<'a, T> IntoIterator for &'a BTreeSet<T> {
 impl<T: Ord> Extend<T> for BTreeSet<T> {
     #[inline]
     fn extend<Iter: IntoIterator<Item = T>>(&mut self, iter: Iter) {
-        for elem in iter {
+        iter.into_iter().for_each(move |elem| {
             self.insert(elem);
-        }
+        });
     }
 }
 
diff --git a/src/liballoc/collections/linked_list.rs b/src/liballoc/collections/linked_list.rs
@@ -1107,9 +1107,7 @@ impl<T> Extend<T> for LinkedList<T> {
 
 impl<I: IntoIterator> SpecExtend<I> for LinkedList<I::Item> {
     default fn spec_extend(&mut self, iter: I) {
-        for elt in iter {
-            self.push_back(elt);
-        }
+        iter.into_iter().for_each(move |elt| self.push_back(elt));
     }
 }
 
diff --git a/src/liballoc/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs
@@ -2677,9 +2677,7 @@ impl<'a, T> IntoIterator for &'a mut VecDeque<T> {
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<A> Extend<A> for VecDeque<A> {
     fn extend<T: IntoIterator<Item = A>>(&mut self, iter: T) {
-        for elt in iter {
-            self.push_back(elt);
-        }
+        iter.into_iter().for_each(move |elt| self.push_back(elt));
     }
 }
 
diff --git a/src/libcore/benches/ascii.rs b/src/libcore/benches/ascii.rs
@@ -2,7 +2,7 @@
 // after wrap-adding 0x1F:
 //
 //     b'a' + 0x1F == 0x80 == 0b1000_0000
-//     b'z' + 0x1F == 0x98 == 0b10011000
+//     b'z' + 0x1F == 0x98 == 0b1001_1000
 //
 // Lower-case ASCII 'z' is the last byte that has its highest bit unset
 // after wrap-adding 0x05:
diff --git a/src/libproc_macro/lib.rs b/src/libproc_macro/lib.rs
@@ -160,9 +160,7 @@ impl iter::FromIterator<TokenTree> for TokenStream {
 impl iter::FromIterator<TokenStream> for TokenStream {
     fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {
         let mut builder = bridge::client::TokenStreamBuilder::new();
-        for stream in streams {
-            builder.push(stream.0);
-        }
+        streams.into_iter().for_each(|stream| builder.push(stream.0));
         TokenStream(builder.build())
     }
 }
diff --git a/src/librustc/hir/def_id.rs b/src/librustc/hir/def_id.rs
@@ -1,10 +1,9 @@
-use crate::ty::{self, print::Printer, subst::Kind, Ty, TyCtxt};
-use crate::hir::map::definitions::{DisambiguatedDefPathData, FIRST_FREE_HIGH_DEF_INDEX};
+use crate::ty::{self, TyCtxt};
+use crate::hir::map::definitions::FIRST_FREE_HIGH_DEF_INDEX;
 use rustc_data_structures::indexed_vec::Idx;
 use serialize;
 use std::fmt;
 use std::u32;
-use syntax::symbol::{LocalInternedString, Symbol};
 
 newtype_index! {
     pub struct CrateId {
@@ -252,107 +251,6 @@ impl DefId {
             format!("module `{}`", tcx.def_path_str(*self))
         }
     }
-
-    /// Check if a `DefId`'s path matches the given absolute type path usage.
-    // Uplifted from rust-lang/rust-clippy
-    pub fn match_path<'a, 'tcx>(self, tcx: TyCtxt<'a, 'tcx, 'tcx>, path: &[&str]) -> bool {
-        pub struct AbsolutePathPrinter<'a, 'tcx> {
-            pub tcx: TyCtxt<'a, 'tcx, 'tcx>,
-        }
-
-        impl<'tcx> Printer<'tcx, 'tcx> for AbsolutePathPrinter<'_, 'tcx> {
-            type Error = !;
-
-            type Path = Vec<LocalInternedString>;
-            type Region = ();
-            type Type = ();
-            type DynExistential = ();
-
-            fn tcx<'a>(&'a self) -> TyCtxt<'a, 'tcx, 'tcx> {
-                self.tcx
-            }
-
-            fn print_region(self, _region: ty::Region<'_>) -> Result<Self::Region, Self::Error> {
-                Ok(())
-            }
-
-            fn print_type(self, _ty: Ty<'tcx>) -> Result<Self::Type, Self::Error> {
-                Ok(())
-            }
-
-            fn print_dyn_existential(
-                self,
-                _predicates: &'tcx ty::List<ty::ExistentialPredicate<'tcx>>,
-                ) -> Result<Self::DynExistential, Self::Error> {
-                Ok(())
-            }
-
-            fn path_crate(self, cnum: CrateNum) -> Result<Self::Path, Self::Error> {
-                Ok(vec![self.tcx.original_crate_name(cnum).as_str()])
-            }
-
-            fn path_qualified(
-                self,
-                self_ty: Ty<'tcx>,
-                trait_ref: Option<ty::TraitRef<'tcx>>,
-                ) -> Result<Self::Path, Self::Error> {
-                if trait_ref.is_none() {
-                    if let ty::Adt(def, substs) = self_ty.sty {
-                        return self.print_def_path(def.did, substs);
-                    }
-                }
-
-                // This shouldn't ever be needed, but just in case:
-                Ok(vec![match trait_ref {
-                    Some(trait_ref) => Symbol::intern(&format!("{:?}", trait_ref)).as_str(),
-                    None => Symbol::intern(&format!("<{}>", self_ty)).as_str(),
-                }])
-            }
-
-            fn path_append_impl(
-                self,
-                print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
-                _disambiguated_data: &DisambiguatedDefPathData,
-                self_ty: Ty<'tcx>,
-                trait_ref: Option<ty::TraitRef<'tcx>>,
-                ) -> Result<Self::Path, Self::Error> {
-                let mut path = print_prefix(self)?;
-
-                // This shouldn't ever be needed, but just in case:
-                path.push(match trait_ref {
-                    Some(trait_ref) => {
-                        Symbol::intern(&format!("<impl {} for {}>", trait_ref, self_ty)).as_str()
-                    },
-                    None => Symbol::intern(&format!("<impl {}>", self_ty)).as_str(),
-                });
-
-                Ok(path)
-            }
-
-            fn path_append(
-                self,
-                print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
-                disambiguated_data: &DisambiguatedDefPathData,
-                ) -> Result<Self::Path, Self::Error> {
-                let mut path = print_prefix(self)?;
-                path.push(disambiguated_data.data.as_interned_str().as_str());
-                Ok(path)
-            }
-
-            fn path_generic_args(
-                self,
-                print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
-                _args: &[Kind<'tcx>],
-                ) -> Result<Self::Path, Self::Error> {
-                print_prefix(self)
-            }
-        }
-
-        let names = AbsolutePathPrinter { tcx }.print_def_path(self, &[]).unwrap();
-
-        names.len() == path.len()
-            && names.into_iter().zip(path.iter()).all(|(a, &b)| *a == *b)
-    }
 }
 
 impl serialize::UseSpecializedEncodable for DefId {}
diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs
@@ -25,7 +25,7 @@ use crate::lint::levels::{LintLevelSets, LintLevelsBuilder};
 use crate::middle::privacy::AccessLevels;
 use crate::rustc_serialize::{Decoder, Decodable, Encoder, Encodable};
 use crate::session::{config, early_error, Session};
-use crate::ty::{self, TyCtxt, Ty};
+use crate::ty::{self, print::Printer, subst::Kind, TyCtxt, Ty};
 use crate::ty::layout::{LayoutError, LayoutOf, TyLayout};
 use crate::util::nodemap::FxHashMap;
 use crate::util::common::time;
@@ -36,9 +36,10 @@ use syntax::edition;
 use syntax_pos::{MultiSpan, Span, symbol::{LocalInternedString, Symbol}};
 use errors::DiagnosticBuilder;
 use crate::hir;
-use crate::hir::def_id::{DefId, LOCAL_CRATE};
+use crate::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
 use crate::hir::intravisit as hir_visit;
 use crate::hir::intravisit::Visitor;
+use crate::hir::map::{definitions::DisambiguatedDefPathData, DefPathData};
 use syntax::util::lev_distance::find_best_match_for_name;
 use syntax::visit as ast_visit;
 
@@ -752,6 +753,114 @@ impl<'a, 'tcx> LateContext<'a, 'tcx> {
     pub fn current_lint_root(&self) -> hir::HirId {
         self.last_node_with_lint_attrs
     }
+
+    /// Check if a `DefId`'s path matches the given absolute type path usage.
+    // Uplifted from rust-lang/rust-clippy
+    pub fn match_path(&self, def_id: DefId, path: &[&str]) -> bool {
+        pub struct AbsolutePathPrinter<'a, 'tcx> {
+            pub tcx: TyCtxt<'a, 'tcx, 'tcx>,
+        }
+
+        impl<'tcx> Printer<'tcx, 'tcx> for AbsolutePathPrinter<'_, 'tcx> {
+            type Error = !;
+
+            type Path = Vec<LocalInternedString>;
+            type Region = ();
+            type Type = ();
+            type DynExistential = ();
+
+            fn tcx<'a>(&'a self) -> TyCtxt<'a, 'tcx, 'tcx> {
+                self.tcx
+            }
+
+            fn print_region(self, _region: ty::Region<'_>) -> Result<Self::Region, Self::Error> {
+                Ok(())
+            }
+
+            fn print_type(self, _ty: Ty<'tcx>) -> Result<Self::Type, Self::Error> {
+                Ok(())
+            }
+
+            fn print_dyn_existential(
+                self,
+                _predicates: &'tcx ty::List<ty::ExistentialPredicate<'tcx>>,
+                ) -> Result<Self::DynExistential, Self::Error> {
+                Ok(())
+            }
+
+            fn path_crate(self, cnum: CrateNum) -> Result<Self::Path, Self::Error> {
+                Ok(vec![self.tcx.original_crate_name(cnum).as_str()])
+            }
+
+            fn path_qualified(
+                self,
+                self_ty: Ty<'tcx>,
+                trait_ref: Option<ty::TraitRef<'tcx>>,
+                ) -> Result<Self::Path, Self::Error> {
+                if trait_ref.is_none() {
+                    if let ty::Adt(def, substs) = self_ty.sty {
+                        return self.print_def_path(def.did, substs);
+                    }
+                }
+
+                // This shouldn't ever be needed, but just in case:
+                Ok(vec![match trait_ref {
+                    Some(trait_ref) => Symbol::intern(&format!("{:?}", trait_ref)).as_str(),
+                    None => Symbol::intern(&format!("<{}>", self_ty)).as_str(),
+                }])
+            }
+
+            fn path_append_impl(
+                self,
+                print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
+                _disambiguated_data: &DisambiguatedDefPathData,
+                self_ty: Ty<'tcx>,
+                trait_ref: Option<ty::TraitRef<'tcx>>,
+                ) -> Result<Self::Path, Self::Error> {
+                let mut path = print_prefix(self)?;
+
+                // This shouldn't ever be needed, but just in case:
+                path.push(match trait_ref {
+                    Some(trait_ref) => {
+                        Symbol::intern(&format!("<impl {} for {}>", trait_ref, self_ty)).as_str()
+                    },
+                    None => Symbol::intern(&format!("<impl {}>", self_ty)).as_str(),
+                });
+
+                Ok(path)
+            }
+
+            fn path_append(
+                self,
+                print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
+                disambiguated_data: &DisambiguatedDefPathData,
+                ) -> Result<Self::Path, Self::Error> {
+                let mut path = print_prefix(self)?;
+
+                // Skip `::{{constructor}}` on tuple/unit structs.
+                match disambiguated_data.data {
+                    DefPathData::Ctor => return Ok(path),
+                    _ => {}
+                }
+
+                path.push(disambiguated_data.data.as_interned_str().as_str());
+                Ok(path)
+            }
+
+            fn path_generic_args(
+                self,
+                print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
+                _args: &[Kind<'tcx>],
+                ) -> Result<Self::Path, Self::Error> {
+                print_prefix(self)
+            }
+        }
+
+        let names = AbsolutePathPrinter { tcx: self.tcx }.print_def_path(def_id, &[]).unwrap();
+
+        names.len() == path.len()
+            && names.into_iter().zip(path.iter()).all(|(a, &b)| *a == *b)
+    }
 }
 
 impl<'a, 'tcx> LayoutOf for LateContext<'a, 'tcx> {
diff --git a/src/librustc/lint/internal.rs b/src/librustc/lint/internal.rs
@@ -100,7 +100,7 @@ fn lint_ty_kind_usage(cx: &LateContext<'_, '_>, segment: &PathSegment) -> bool {
     if segment.ident.as_str() == "TyKind" {
         if let Some(def) = segment.def {
             if let Some(did) = def.opt_def_id() {
-                return did.match_path(cx.tcx, &["rustc", "ty", "sty", "TyKind"]);
+                return cx.match_path(did, &["rustc", "ty", "sty", "TyKind"]);
             }
         }
     }
diff --git a/src/libstd/path.rs b/src/libstd/path.rs
@@ -1551,9 +1551,7 @@ impl<P: AsRef<Path>> iter::FromIterator<P> for PathBuf {
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<P: AsRef<Path>> iter::Extend<P> for PathBuf {
     fn extend<I: IntoIterator<Item = P>>(&mut self, iter: I) {
-        for p in iter {
-            self.push(p.as_ref())
-        }
+        iter.into_iter().for_each(move |p| self.push(p.as_ref()));
     }
 }
 
diff --git a/src/libstd/sys_common/wtf8.rs b/src/libstd/sys_common/wtf8.rs
@@ -388,9 +388,7 @@ impl Extend<CodePoint> for Wtf8Buf {
         let (low, _high) = iterator.size_hint();
         // Lower bound of one byte per code point (ASCII only)
         self.bytes.reserve(low);
-        for code_point in iterator {
-            self.push(code_point);
-        }
+        iterator.for_each(move |code_point| self.push(code_point));
     }
 }
 
diff --git a/src/tools/miri b/src/tools/miri
@@ -1 +1 @@
-Subproject commit 82f9a0173011b96411d315b332754ee6b35cf00f
+Subproject commit 0e4f9634a6850c6c10747cda0b56192ec8c00717

Original file line number	Diff line number	Diff line change
`@@ -1177,9 +1177,7 @@ impl<T: Ord> BinaryHeap<T> {`
`1177`	`1177`
`1178`	`1178`	`self.reserve(lower);`
`1179`	`1179`
`1180`		`- for elem in iterator {`
`1181`		`- self.push(elem);`
`1182`		`- }`
	`1180`	`+ iterator.for_each(move \|elem\| self.push(elem));`
`1183`	`1181`	`}`
`1184`	`1182`	`}`
`1185`	`1183`
Original file line number	Diff line number	Diff line change
`@@ -1727,9 +1727,9 @@ impl<K: Ord, V> FromIterator<(K, V)> for BTreeMap<K, V> {`
`1727`	`1727`	`impl<K: Ord, V> Extend<(K, V)> for BTreeMap<K, V> {`
`1728`	`1728`	`#[inline]`
`1729`	`1729`	`fn extend<T: IntoIterator<Item = (K, V)>>(&mut self, iter: T) {`
`1730`		`- for (k, v) in iter {`
	`1730`	`+ iter.into_iter().for_each(move \|(k, v)\| {`
`1731`	`1731`	`self.insert(k, v);`
`1732`		`- }`
	`1732`	`+ });`
`1733`	`1733`	`}`
`1734`	`1734`	`}`
`1735`	`1735`
Original file line number	Diff line number	Diff line change
`@@ -883,9 +883,9 @@ impl<'a, T> IntoIterator for &'a BTreeSet<T> {`
`883`	`883`	`impl<T: Ord> Extend<T> for BTreeSet<T> {`
`884`	`884`	`#[inline]`
`885`	`885`	`fn extend<Iter: IntoIterator<Item = T>>(&mut self, iter: Iter) {`
`886`		`- for elem in iter {`
	`886`	`+ iter.into_iter().for_each(move \|elem\| {`
`887`	`887`	`self.insert(elem);`
`888`		`- }`
	`888`	`+ });`
`889`	`889`	`}`
`890`	`890`	`}`
`891`	`891`
Original file line number	Diff line number	Diff line change
`@@ -1107,9 +1107,7 @@ impl<T> Extend<T> for LinkedList<T> {`
`1107`	`1107`
`1108`	`1108`	`impl<I: IntoIterator> SpecExtend<I> for LinkedList<I::Item> {`
`1109`	`1109`	`default fn spec_extend(&mut self, iter: I) {`
`1110`		`- for elt in iter {`
`1111`		`- self.push_back(elt);`
`1112`		`- }`
	`1110`	`+ iter.into_iter().for_each(move \|elt\| self.push_back(elt));`
`1113`	`1111`	`}`
`1114`	`1112`	`}`
`1115`	`1113`
Original file line number	Diff line number	Diff line change
`@@ -2677,9 +2677,7 @@ impl<'a, T> IntoIterator for &'a mut VecDeque<T> {`
`2677`	`2677`	`#[stable(feature = "rust1", since = "1.0.0")]`
`2678`	`2678`	`impl<A> Extend<A> for VecDeque<A> {`
`2679`	`2679`	`fn extend<T: IntoIterator<Item = A>>(&mut self, iter: T) {`
`2680`		`- for elt in iter {`
`2681`		`- self.push_back(elt);`
`2682`		`- }`
	`2680`	`+ iter.into_iter().for_each(move \|elt\| self.push_back(elt));`
`2683`	`2681`	`}`
`2684`	`2682`	`}`
`2685`	`2683`
Original file line number	Diff line number	Diff line change
`@@ -160,9 +160,7 @@ impl iter::FromIterator<TokenTree> for TokenStream {`
`160`	`160`	`impl iter::FromIterator<TokenStream> for TokenStream {`
`161`	`161`	`fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {`
`162`	`162`	`let mut builder = bridge::client::TokenStreamBuilder::new();`
`163`		`- for stream in streams {`
`164`		`- builder.push(stream.0);`
`165`		`- }`
	`163`	`+ streams.into_iter().for_each(\|stream\| builder.push(stream.0));`
`166`	`164`	`TokenStream(builder.build())`
`167`	`165`	`}`
`168`	`166`	`}`