about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-24 16:55:35 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-03-24 18:37:16 -0700
commit3021d4c56422e15331e38f4b7b04c7229e024fda (patch)
treeb585f5625dde7ab0af35fb3dd41a67ba0507f525 /src/libcore
parentdb2c3ba0cfc7f9d4ee16be38f885ef129a3a8f71 (diff)
downloadrust-3021d4c56422e15331e38f4b7b04c7229e024fda.tar.gz
rust-3021d4c56422e15331e38f4b7b04c7229e024fda.zip
Test fixes and rebase conflicts, round 2
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/str/mod.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index 36c3eb33c77..ea98f6f5f24 100644
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -28,6 +28,7 @@ use iter::ExactSizeIterator;
 use iter::{Map, Iterator, IteratorExt, DoubleEndedIterator};
 use marker::Sized;
 use mem;
+#[allow(deprecated)]
 use num::Int;
 use ops::{Fn, FnMut, FnOnce};
 use option::Option::{self, None, Some};