diff --git a/src/libcore/tests/cell.rs b/src/libcore/tests/cell.rs index 7bd7d187410..4dfd884d237 100644 --- a/src/libcore/tests/cell.rs +++ b/src/libcore/tests/cell.rs @@ -139,11 +139,11 @@ fn ref_clone_updates_flag() { fn ref_map_does_not_update_flag() { let x = RefCell::new(Some(5)); { - let b1: Ref> = x.borrow(); + let b1: Ref<'_, Option> = x.borrow(); assert!(x.try_borrow().is_ok()); assert!(x.try_borrow_mut().is_err()); { - let b2: Ref = Ref::map(b1, |o| o.as_ref().unwrap()); + let b2: Ref<'_, u32> = Ref::map(b1, |o| o.as_ref().unwrap()); assert_eq!(*b2, 5); assert!(x.try_borrow().is_ok()); assert!(x.try_borrow_mut().is_err()); @@ -217,12 +217,12 @@ fn ref_mut_map_split() { fn ref_map_accessor() { struct X(RefCell<(u32, char)>); impl X { - fn accessor(&self) -> Ref { + fn accessor(&self) -> Ref<'_, u32> { Ref::map(self.0.borrow(), |tuple| &tuple.0) } } let x = X(RefCell::new((7, 'z'))); - let d: Ref = x.accessor(); + let d: Ref<'_, u32> = x.accessor(); assert_eq!(*d, 7); } @@ -230,13 +230,13 @@ fn ref_map_accessor() { fn ref_mut_map_accessor() { struct X(RefCell<(u32, char)>); impl X { - fn accessor(&self) -> RefMut { + fn accessor(&self) -> RefMut<'_, u32> { RefMut::map(self.0.borrow_mut(), |tuple| &mut tuple.0) } } let x = X(RefCell::new((7, 'z'))); { - let mut d: RefMut = x.accessor(); + let mut d: RefMut<'_ ,u32> = x.accessor(); assert_eq!(*d, 7); *d += 1; } @@ -333,16 +333,16 @@ fn refcell_unsized() { fn refcell_ref_coercion() { let cell: RefCell<[i32; 3]> = RefCell::new([1, 2, 3]); { - let mut cellref: RefMut<[i32; 3]> = cell.borrow_mut(); + let mut cellref: RefMut<'_, [i32; 3]> = cell.borrow_mut(); cellref[0] = 4; - let mut coerced: RefMut<[i32]> = cellref; + let mut coerced: RefMut<'_, [i32]> = cellref; coerced[2] = 5; } { let comp: &mut [i32] = &mut [4, 2, 5]; - let cellref: Ref<[i32; 3]> = cell.borrow(); + let cellref: Ref<'_, [i32; 3]> = cell.borrow(); assert_eq!(&*cellref, comp); - let coerced: Ref<[i32]> = cellref; + let coerced: Ref<'_, [i32]> = cellref; assert_eq!(&*coerced, comp); } } diff --git a/src/libcore/tests/fmt/builders.rs b/src/libcore/tests/fmt/builders.rs index e4b75fe1fa2..62fe09c5eb3 100644 --- a/src/libcore/tests/fmt/builders.rs +++ b/src/libcore/tests/fmt/builders.rs @@ -6,7 +6,7 @@ mod debug_struct { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct("Foo").finish() } } @@ -20,7 +20,7 @@ mod debug_struct { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct("Foo") .field("bar", &true) .finish() @@ -40,7 +40,7 @@ mod debug_struct { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct("Foo") .field("bar", &true) .field("baz", &format_args!("{}/{}", 10, 20)) @@ -62,7 +62,7 @@ mod debug_struct { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct("Foo") .field("bar", &true) .field("baz", &format_args!("{}/{}", 10, 20)) @@ -73,7 +73,7 @@ mod debug_struct { struct Bar; impl fmt::Debug for Bar { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct("Bar") .field("foo", &Foo) .field("hello", &"world") @@ -103,7 +103,7 @@ mod debug_tuple { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple("Foo").finish() } } @@ -117,7 +117,7 @@ mod debug_tuple { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple("Foo") .field(&true) .finish() @@ -137,7 +137,7 @@ mod debug_tuple { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple("Foo") .field(&true) .field(&format_args!("{}/{}", 10, 20)) @@ -159,7 +159,7 @@ mod debug_tuple { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple("Foo") .field(&true) .field(&format_args!("{}/{}", 10, 20)) @@ -170,7 +170,7 @@ mod debug_tuple { struct Bar; impl fmt::Debug for Bar { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple("Bar") .field(&Foo) .field(&"world") @@ -200,7 +200,7 @@ mod debug_map { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_map().finish() } } @@ -214,7 +214,7 @@ mod debug_map { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_map() .entry(&"bar", &true) .finish() @@ -234,7 +234,7 @@ mod debug_map { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_map() .entry(&"bar", &true) .entry(&10, &format_args!("{}/{}", 10, 20)) @@ -256,7 +256,7 @@ mod debug_map { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_map() .entry(&"bar", &true) .entry(&10, &format_args!("{}/{}", 10, 20)) @@ -267,7 +267,7 @@ mod debug_map { struct Bar; impl fmt::Debug for Bar { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_map() .entry(&"foo", &Foo) .entry(&Foo, &"world") @@ -301,7 +301,7 @@ mod debug_set { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_set().finish() } } @@ -315,7 +315,7 @@ mod debug_set { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_set() .entry(&true) .finish() @@ -335,7 +335,7 @@ mod debug_set { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_set() .entry(&true) .entry(&format_args!("{}/{}", 10, 20)) @@ -357,7 +357,7 @@ mod debug_set { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_set() .entry(&true) .entry(&format_args!("{}/{}", 10, 20)) @@ -368,7 +368,7 @@ mod debug_set { struct Bar; impl fmt::Debug for Bar { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_set() .entry(&Foo) .entry(&"world") @@ -398,7 +398,7 @@ mod debug_list { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_list().finish() } } @@ -412,7 +412,7 @@ mod debug_list { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_list() .entry(&true) .finish() @@ -432,7 +432,7 @@ mod debug_list { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_list() .entry(&true) .entry(&format_args!("{}/{}", 10, 20)) @@ -454,7 +454,7 @@ mod debug_list { struct Foo; impl fmt::Debug for Foo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_list() .entry(&true) .entry(&format_args!("{}/{}", 10, 20)) @@ -465,7 +465,7 @@ mod debug_list { struct Bar; impl fmt::Debug for Bar { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_list() .entry(&Foo) .entry(&"world") diff --git a/src/libcore/tests/iter.rs b/src/libcore/tests/iter.rs index 5247331fba2..7dfb1adad9e 100644 --- a/src/libcore/tests/iter.rs +++ b/src/libcore/tests/iter.rs @@ -567,12 +567,12 @@ fn test_iterator_peekable_fold() { /// This is an iterator that follows the Iterator contract, /// but it is not fused. After having returned None once, it will start /// producing elements if .next() is called again. -pub struct CycleIter<'a, T: 'a> { +pub struct CycleIter<'a, T> { index: usize, data: &'a [T], } -pub fn cycle(data: &[T]) -> CycleIter { +pub fn cycle(data: &[T]) -> CycleIter<'_, T> { CycleIter { index: 0, data, diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs index fcdeb57f482..2e4a8a15d20 100644 --- a/src/libcore/tests/lib.rs +++ b/src/libcore/tests/lib.rs @@ -32,8 +32,8 @@ #![feature(slice_partition_dedup)] #![feature(copy_within)] #![feature(int_error_matching)] +#![deny(rust_2018_idioms)] -extern crate core; extern crate test; mod any;