Skip to content

Commit 0ab9629

Browse files
committed
---
yaml --- r: 209771 b: refs/heads/try c: 224fc10 h: refs/heads/master i: 209769: 91e3c58 209767: 523b84a v: v3
1 parent 61332aa commit 0ab9629

File tree

6 files changed

+4
-13
lines changed

6 files changed

+4
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: a1dd5ac78745a9f266573d539ba34bbd75b50277
5+
refs/heads/try: 224fc1085b96e6a497ed7d1bb47ef6f49674202b
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libcollections/string.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use core::mem;
2121
use core::ops::{self, Deref, Add, Index};
2222
use core::ptr;
2323
use core::slice;
24-
#[allow(deprecated)] use core::str::Str;
2524
use core::str::pattern::Pattern;
2625
use rustc_unicode::str as unicode_str;
2726
use rustc_unicode::str::Utf16Item;

branches/try/src/libcollections/vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ use core::ops::{Index, IndexMut, Deref, Add};
6363
use core::ops;
6464
use core::ptr;
6565
use core::ptr::Unique;
66-
use core::slice::{self, AsSlice};
66+
use core::slice;
6767
use core::isize;
6868
use core::usize;
6969

branches/try/src/libstd/dynamic_lib.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -259,19 +259,14 @@ mod dl {
259259

260260
#[cfg(target_os = "windows")]
261261
mod dl {
262+
use prelude::v1::*;
263+
262264
use ffi::OsStr;
263-
use iter::Iterator;
264265
use libc;
265266
use libc::consts::os::extra::ERROR_CALL_NOT_IMPLEMENTED;
266-
use ops::FnOnce;
267267
use sys::os;
268268
use os::windows::prelude::*;
269-
use option::Option::{self, Some, None};
270269
use ptr;
271-
use result::Result;
272-
use result::Result::{Ok, Err};
273-
use string::String;
274-
use vec::Vec;
275270
use sys::c::compat::kernel32::SetThreadErrorMode;
276271

277272
pub fn open(filename: Option<&OsStr>) -> Result<*mut u8, String> {

branches/try/src/libstd/sys/windows/fs2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use core::prelude::*;
1212
use io::prelude::*;
1313
use os::windows::prelude::*;
1414

15-
use default::Default;
1615
use ffi::OsString;
1716
use fmt;
1817
use io::{self, Error, SeekFrom};

branches/try/src/test/run-pass/task-stderr.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// pretty-expanded FIXME #23616
12-
1311
#![feature(box_syntax, set_stdio)]
1412

1513
use std::io::prelude::*;

0 commit comments

Comments
 (0)