diff --git a/configure b/configure index 0255b04caa316..287b7b352195c 100755 --- a/configure +++ b/configure @@ -1035,7 +1035,7 @@ then if [ -n "$CFG_OSX_CLANG_VERSION" ] then case $CFG_OSX_CLANG_VERSION in - (7.0*) + (7.0* | 7.1* | 7.2*) step_msg "found ok version of APPLE CLANG: $CFG_OSX_CLANG_VERSION" ;; (*) diff --git a/src/doc/book/lifetimes.md b/src/doc/book/lifetimes.md index 8bf90b4ea4d8a..4193c93c894c4 100644 --- a/src/doc/book/lifetimes.md +++ b/src/doc/book/lifetimes.md @@ -353,8 +353,8 @@ fn frob<'a, 'b>(s: &'a str, t: &'b str) -> &str; // Expanded: Output lifetime is fn get_mut(&mut self) -> &mut T; // elided fn get_mut<'a>(&'a mut self) -> &'a mut T; // expanded -fn args(&mut self, args: &[T]) -> &mut Command; // elided -fn args<'a, 'b, T:ToCStr>(&'a mut self, args: &'b [T]) -> &'a mut Command; // expanded +fn args(&mut self, args: &[T]) -> &mut Command; // elided +fn args<'a, 'b, T: ToCStr>(&'a mut self, args: &'b [T]) -> &'a mut Command; // expanded fn new(buf: &mut [u8]) -> BufWriter; // elided fn new<'a>(buf: &'a mut [u8]) -> BufWriter<'a>; // expanded diff --git a/src/doc/book/macros.md b/src/doc/book/macros.md index 7c8b74bd6495d..f5a0cd5e2c6a3 100644 --- a/src/doc/book/macros.md +++ b/src/doc/book/macros.md @@ -285,9 +285,11 @@ This expands to ```text const char *state = "reticulating splines"; -int state = get_log_state(); -if (state > 0) { - printf("log(%d): %s\n", state, state); +{ + int state = get_log_state(); + if (state > 0) { + printf("log(%d): %s\n", state, state); + } } ``` diff --git a/src/doc/nomicon/lifetime-elision.md b/src/doc/nomicon/lifetime-elision.md index 41014f46dd953..bcd93a58d859a 100644 --- a/src/doc/nomicon/lifetime-elision.md +++ b/src/doc/nomicon/lifetime-elision.md @@ -55,8 +55,8 @@ fn frob(s: &str, t: &str) -> &str; // ILLEGAL fn get_mut(&mut self) -> &mut T; // elided fn get_mut<'a>(&'a mut self) -> &'a mut T; // expanded -fn args(&mut self, args: &[T]) -> &mut Command // elided -fn args<'a, 'b, T:ToCStr>(&'a mut self, args: &'b [T]) -> &'a mut Command // expanded +fn args(&mut self, args: &[T]) -> &mut Command // elided +fn args<'a, 'b, T: ToCStr>(&'a mut self, args: &'b [T]) -> &'a mut Command // expanded fn new(buf: &mut [u8]) -> BufWriter; // elided fn new<'a>(buf: &'a mut [u8]) -> BufWriter<'a> // expanded diff --git a/src/libcollections/btree/set.rs b/src/libcollections/btree/set.rs index c1381dde762e5..91fc8d8217f53 100644 --- a/src/libcollections/btree/set.rs +++ b/src/libcollections/btree/set.rs @@ -14,7 +14,7 @@ use core::cmp::Ordering::{self, Less, Greater, Equal}; use core::fmt::Debug; use core::fmt; -use core::iter::{Peekable, Map, FromIterator}; +use core::iter::{Peekable, FromIterator}; use core::ops::{BitOr, BitAnd, BitXor, Sub}; use borrow::Borrow; @@ -52,12 +52,12 @@ pub struct Iter<'a, T: 'a> { /// An owning iterator over a BTreeSet's items. #[stable(feature = "rust1", since = "1.0.0")] pub struct IntoIter { - iter: Map<::btree_map::IntoIter, fn((T, ())) -> T>, + iter: ::btree_map::IntoIter, } /// An iterator over a sub-range of BTreeSet's items. pub struct Range<'a, T: 'a> { - iter: Map<::btree_map::Range<'a, T, ()>, fn((&'a T, &'a ())) -> &'a T>, + iter: ::btree_map::Range<'a, T, ()>, } /// A lazy iterator producing elements in the set difference (in-order). @@ -160,12 +160,7 @@ impl BTreeSet { -> Range<'a, T> where T: Borrow + Borrow { - fn first((a, _): (A, B)) -> A { - a - } - let first: fn((&'a T, &'a ())) -> &'a T = first; // coerce to fn pointer - - Range { iter: self.map.range(min, max).map(first) } + Range { iter: self.map.range(min, max) } } } @@ -548,12 +543,7 @@ impl IntoIterator for BTreeSet { /// assert_eq!(v, [1, 2, 3, 4]); /// ``` fn into_iter(self) -> IntoIter { - fn first((a, _): (A, B)) -> A { - a - } - let first: fn((T, ())) -> T = first; // coerce to fn pointer - - IntoIter { iter: self.map.into_iter().map(first) } + IntoIter { iter: self.map.into_iter() } } } @@ -721,7 +711,7 @@ impl Iterator for IntoIter { type Item = T; fn next(&mut self) -> Option { - self.iter.next() + self.iter.next().map(|(k, _)| k) } fn size_hint(&self) -> (usize, Option) { self.iter.size_hint() @@ -730,7 +720,7 @@ impl Iterator for IntoIter { #[stable(feature = "rust1", since = "1.0.0")] impl DoubleEndedIterator for IntoIter { fn next_back(&mut self) -> Option { - self.iter.next_back() + self.iter.next_back().map(|(k, _)| k) } } #[stable(feature = "rust1", since = "1.0.0")] @@ -746,12 +736,12 @@ impl<'a, T> Iterator for Range<'a, T> { type Item = &'a T; fn next(&mut self) -> Option<&'a T> { - self.iter.next() + self.iter.next().map(|(k, _)| k) } } impl<'a, T> DoubleEndedIterator for Range<'a, T> { fn next_back(&mut self) -> Option<&'a T> { - self.iter.next_back() + self.iter.next_back().map(|(k, _)| k) } } diff --git a/src/libcollections/fmt.rs b/src/libcollections/fmt.rs index d46a3e7e89e88..97b01a607f5e6 100644 --- a/src/libcollections/fmt.rs +++ b/src/libcollections/fmt.rs @@ -348,8 +348,8 @@ //! The fill character is provided normally in conjunction with the `width` //! parameter. This indicates that if the value being formatted is smaller than //! `width` some extra characters will be printed around it. The extra -//! characters are specified by `fill`, and the alignment can be one of two -//! options: +//! characters are specified by `fill`, and the alignment can be one of the +//! following options: //! //! * `<` - the argument is left-aligned in `width` columns //! * `^` - the argument is center-aligned in `width` columns diff --git a/src/libcollectionstest/btree/set.rs b/src/libcollectionstest/btree/set.rs index 8fcfe97f42afc..fee183433285e 100644 --- a/src/libcollectionstest/btree/set.rs +++ b/src/libcollectionstest/btree/set.rs @@ -254,3 +254,13 @@ fn test_recovery() { assert_eq!(s.iter().next(), None); } + +#[test] +fn test_variance() { + use std::collections::btree_set::{IntoIter, Iter, Range}; + + fn set<'new>(v: BTreeSet<&'static str>) -> BTreeSet<&'new str> { v } + fn iter<'a, 'new>(v: Iter<'a, &'static str>) -> Iter<'a, &'new str> { v } + fn into_iter<'new>(v: IntoIter<&'static str>) -> IntoIter<&'new str> { v } + fn range<'a, 'new>(v: Range<'a, &'static str>) -> Range<'a, &'new str> { v } +} diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index 621dce3efc86b..1ed2a219fac3a 100644 --- a/src/libcore/marker.rs +++ b/src/libcore/marker.rs @@ -333,7 +333,7 @@ macro_rules! impls{ /// use std::marker::PhantomData; /// /// # #[allow(dead_code)] -/// struct Slice<'a, T:'a> { +/// struct Slice<'a, T: 'a> { /// start: *const T, /// end: *const T, /// phantom: PhantomData<&'a T> @@ -428,18 +428,18 @@ mod impls { /// use std::any::Any; /// /// # #[allow(dead_code)] -/// fn foo(x: &T) { +/// fn foo(x: &T) { /// let any: &Any = x; /// if any.is::() { println!("u32"); } /// } /// ``` /// -/// Without the declaration `T:Reflect`, `foo` would not type check +/// Without the declaration `T: Reflect`, `foo` would not type check /// (note: as a matter of style, it would be preferable to write -/// `T:Any`, because `T:Any` implies `T:Reflect` and `T:'static`, but +/// `T: Any`, because `T: Any` implies `T: Reflect` and `T: 'static`, but /// we use `Reflect` here to show how it works). The `Reflect` bound /// thus serves to alert `foo`'s caller to the fact that `foo` may -/// behave differently depending on whether `T=u32` or not. In +/// behave differently depending on whether `T = u32` or not. In /// particular, thanks to the `Reflect` bound, callers know that a /// function declared like `fn bar(...)` will always act in /// precisely the same way no matter what type `T` is supplied,