Fix 2018 edition fallout.

rust-lang · Apr 19, 2019 · 6cc67c7 · 6cc67c7
1 parent f1f34fa
commit 6cc67c7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/src/libcore/needle/ext.rs b/src/libcore/needle/ext.rs
@@ -5,9 +5,9 @@ use super::needle::{
     Needle, Searcher, ReverseSearcher, DoubleEndedSearcher,
     Consumer, ReverseConsumer, DoubleEndedConsumer,
 };
-use iter::FusedIterator;
-use ops::Range;
-use fmt;
+use crate::iter::FusedIterator;
+use crate::ops::Range;
+use crate::fmt;
 
 macro_rules! generate_clone_and_debug {
     ($name:ident, $field:tt) => {
@@ -31,7 +31,7 @@ macro_rules! generate_clone_and_debug {
             S: fmt::Debug,
             H::Target: Hay, // FIXME: RFC 2089 or 2289
         {
-            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
                 f.debug_tuple(stringify!($name))
                     .field(&self.$field)
                     .finish()

diff --git a/src/libcore/needle/haystack.rs b/src/libcore/needle/haystack.rs
@@ -1,5 +1,5 @@
-use fmt::Debug;
-use ops::{Deref, Range};
+use crate::fmt::Debug;
+use crate::ops::{Deref, Range};
 
 /// Borrowed `Haystack`.
 ///
@@ -314,7 +314,7 @@ where H::Target: Hay // FIXME: RFC 2089 or 2289
 {
     #[inline]
     default fn take(&mut self) -> Self {
-        ::mem::replace(self, Self::empty())
+        crate::mem::replace(self, Self::empty())
     }
 
     #[inline]

diff --git a/src/libcore/needle/needle.rs b/src/libcore/needle/needle.rs
@@ -1,6 +1,6 @@
 use super::haystack::{Haystack, Hay, Span};
 
-use ops::Range;
+use crate::ops::Range;
 
 /// A searcher, for searching a [`Needle`](trait.Needle.html) from a
 /// [`Hay`](trait.Hay.html).

diff --git a/src/libcore/slice/needles.rs b/src/libcore/slice/needles.rs
@@ -1,8 +1,8 @@
-use needle::*;
-use ops::Range;
-use cmp::{Ordering, max, min};
-use usize;
-use fmt;
+use crate::needle::*;
+use crate::ops::Range;
+use crate::cmp::{Ordering, max, min};
+use crate::usize;
+use crate::fmt;
 
 //------------------------------------------------------------------------------
 // Element searcher

diff --git a/src/libcore/str/needles.rs b/src/libcore/str/needles.rs
@@ -1,8 +1,8 @@
-use needle::*;
-use ops::Range;
-use slice::needles::{SliceSearcher, NaiveSearcher, TwoWaySearcher};
-use slice::memchr::{memchr, memrchr};
-use fmt;
+use crate::needle::*;
+use crate::ops::Range;
+use crate::slice::needles::{SliceSearcher, NaiveSearcher, TwoWaySearcher};
+use crate::slice::memchr::{memchr, memrchr};
+use crate::fmt;
 
 //------------------------------------------------------------------------------
 // Character function searcher