Skip to content

Commit 5acb4c8

Browse files
committed
---
yaml --- r: 151468 b: refs/heads/try2 c: fac0d4e h: refs/heads/master v: v3
1 parent 46d27b9 commit 5acb4c8

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 1d57da783b150a84c7b4ead283483bdd48029abb
8+
refs/heads/try2: fac0d4e135540a4cb45b49a018d9c1e86fe7eea2
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/num/strconv.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use num::{Float, FPNaN, FPInfinite, ToPrimitive};
1919
use num;
2020
use ops::{Add, Sub, Mul, Div, Rem, Neg};
2121
use option::{None, Option, Some};
22-
use slice::OwnedVector;
2322
use slice::{CloneableVector, ImmutableVector, MutableVector};
2423
use std::cmp::{Ord, Eq};
2524
use str::{Str, StrSlice};

branches/try2/src/libstd/slice.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -744,11 +744,6 @@ impl<'a, T: TotalOrd> MutableTotalOrdVector<T> for &'a mut [T] {
744744

745745
/// Unsafe operations
746746
pub mod raw {
747-
use iter::Iterator;
748-
use ptr;
749-
use slice::{MutableVector, OwnedVector};
750-
use vec::Vec;
751-
752747
pub use core::slice::raw::{buf_as_slice, mut_buf_as_slice};
753748
pub use core::slice::raw::{shift_ptr, pop_ptr};
754749
}

branches/try2/src/libstd/str.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,9 @@ use fmt;
8585
use io::Writer;
8686
use iter::{Iterator, range, AdditiveIterator};
8787
use option::{None, Option, Some};
88-
use ptr;
8988
use from_str::FromStr;
90-
use slice::{OwnedVector, ImmutableVector, MutableVector, CloneableVector};
91-
use slice::{Vector};
89+
use slice::{ImmutableVector, MutableVector, CloneableVector};
90+
use slice::Vector;
9291
use vec::Vec;
9392
use default::Default;
9493
use strbuf::StrBuf;
@@ -671,9 +670,9 @@ pub mod raw {
671670
use iter::Iterator;
672671
use libc;
673672
use ptr::RawPtr;
674-
use ptr;
675-
use slice::{MutableVector, OwnedVector, Vector};
676-
use str::{is_utf8};
673+
use raw::Slice;
674+
use slice::ImmutableVector;
675+
use str::is_utf8;
677676

678677
pub use core::str::raw::{from_utf8, c_str_to_static_slice, slice_bytes};
679678
pub use core::str::raw::{slice_unchecked};

0 commit comments

Comments
 (0)