Skip to content

Commit 6cc67c7

Browse files
committed
Fix 2018 edition fallout.
1 parent f1f34fa commit 6cc67c7

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

src/libcore/needle/ext.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use super::needle::{
55
Needle, Searcher, ReverseSearcher, DoubleEndedSearcher,
66
Consumer, ReverseConsumer, DoubleEndedConsumer,
77
};
8-
use iter::FusedIterator;
9-
use ops::Range;
10-
use fmt;
8+
use crate::iter::FusedIterator;
9+
use crate::ops::Range;
10+
use crate::fmt;
1111

1212
macro_rules! generate_clone_and_debug {
1313
($name:ident, $field:tt) => {
@@ -31,7 +31,7 @@ macro_rules! generate_clone_and_debug {
3131
S: fmt::Debug,
3232
H::Target: Hay, // FIXME: RFC 2089 or 2289
3333
{
34-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
34+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
3535
f.debug_tuple(stringify!($name))
3636
.field(&self.$field)
3737
.finish()

src/libcore/needle/haystack.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use fmt::Debug;
2-
use ops::{Deref, Range};
1+
use crate::fmt::Debug;
2+
use crate::ops::{Deref, Range};
33

44
/// Borrowed `Haystack`.
55
///
@@ -314,7 +314,7 @@ where H::Target: Hay // FIXME: RFC 2089 or 2289
314314
{
315315
#[inline]
316316
default fn take(&mut self) -> Self {
317-
::mem::replace(self, Self::empty())
317+
crate::mem::replace(self, Self::empty())
318318
}
319319

320320
#[inline]

src/libcore/needle/needle.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::haystack::{Haystack, Hay, Span};
22

3-
use ops::Range;
3+
use crate::ops::Range;
44

55
/// A searcher, for searching a [`Needle`](trait.Needle.html) from a
66
/// [`Hay`](trait.Hay.html).

src/libcore/slice/needles.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use needle::*;
2-
use ops::Range;
3-
use cmp::{Ordering, max, min};
4-
use usize;
5-
use fmt;
1+
use crate::needle::*;
2+
use crate::ops::Range;
3+
use crate::cmp::{Ordering, max, min};
4+
use crate::usize;
5+
use crate::fmt;
66

77
//------------------------------------------------------------------------------
88
// Element searcher

src/libcore/str/needles.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use needle::*;
2-
use ops::Range;
3-
use slice::needles::{SliceSearcher, NaiveSearcher, TwoWaySearcher};
4-
use slice::memchr::{memchr, memrchr};
5-
use fmt;
1+
use crate::needle::*;
2+
use crate::ops::Range;
3+
use crate::slice::needles::{SliceSearcher, NaiveSearcher, TwoWaySearcher};
4+
use crate::slice::memchr::{memchr, memrchr};
5+
use crate::fmt;
66

77
//------------------------------------------------------------------------------
88
// Character function searcher

0 commit comments

Comments
 (0)