Skip to content

Commit 97550c5

Browse files
committed
light warning cleanup
1 parent 594f40e commit 97550c5

File tree

25 files changed

+10
-41
lines changed

25 files changed

+10
-41
lines changed

src/libextra/arc.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,13 @@ pub impl<T:Owned> MutexARC<T> {
200200
*/
201201
#[inline(always)]
202202
unsafe fn access<U>(&self, blk: &fn(x: &mut T) -> U) -> U {
203-
unsafe {
204-
let state = self.x.get();
205-
// Borrowck would complain about this if the function were
206-
// not already unsafe. See borrow_rwlock, far below.
207-
do (&(*state).lock).lock {
208-
check_poison(true, (*state).failed);
209-
let _z = PoisonOnFail(&mut (*state).failed);
210-
blk(&mut (*state).data)
211-
}
203+
let state = self.x.get();
204+
// Borrowck would complain about this if the function were
205+
// not already unsafe. See borrow_rwlock, far below.
206+
do (&(*state).lock).lock {
207+
check_poison(true, (*state).failed);
208+
let _z = PoisonOnFail(&mut (*state).failed);
209+
blk(&mut (*state).data)
212210
}
213211
}
214212

src/libextra/bitv.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use core::prelude::*;
1313
use core::cmp;
1414
use core::ops;
1515
use core::uint;
16-
use core::vec::from_elem;
1716
use core::vec;
1817

1918
struct SmallBitv {

src/libextra/flate.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ Simple compression
1616

1717
#[allow(missing_doc)];
1818

19-
use core::prelude::*;
20-
2119
use core::libc::{c_void, size_t, c_int};
2220
use core::libc;
2321
use core::vec;

src/libextra/std.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ not required in or otherwise suitable for the core library.
3737

3838
extern mod core(name = "std", vers = "0.7-pre");
3939

40+
#[cfg(stage0)]
4041
use core::{str, unstable};
4142
use core::str::{StrSlice, OwnedStr};
4243

src/libextra/test.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@ use term;
2424
use core::comm::{stream, SharedChan};
2525
use core::either;
2626
use core::io;
27-
use core::num;
2827
use core::option;
2928
use core::result;
3029
use core::str;
3130
use core::task;
3231
use core::to_str::ToStr;
33-
use core::u64;
3432
use core::uint;
3533
use core::vec;
3634

src/libextra/uv_global_loop.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ use iotask = uv_iotask;
1616
use uv_iotask::{IoTask, spawn_iotask};
1717

1818
use core::comm::Chan;
19-
use core::libc;
2019
use core::option::{Some, None};
21-
use core::str;
2220
use core::task::task;
2321
use core::unstable::global::{global_data_clone_create, global_data_clone};
2422
use core::unstable::weak_task::weaken_task;

src/librustc/back/link.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ pub mod jit {
106106
use metadata::cstore;
107107

108108
use core::cast;
109-
use core::char;
110109
use core::libc::c_int;
111-
use core::os;
112110
use core::ptr;
113111
use core::str;
114112

src/librustc/back/passes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use core::prelude::*;
1212
use core::str;
1313
use core::io;
1414

15-
use driver::session::{OptLevel, No, Less, Default, Aggressive};
15+
use driver::session::{OptLevel, No, Less, Aggressive};
1616
use driver::session::{Session};
1717
use lib::llvm::{PassRef, ModuleRef,PassManagerRef,TargetDataRef};
1818
use lib::llvm::llvm;

src/librustc/middle/trans/foreign.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use middle::ty;
3434
use middle::ty::FnSig;
3535
use util::ppaux::ty_to_str;
3636

37-
use core::str;
3837
use core::uint;
3938
use core::vec;
4039
use syntax::codemap::span;

src/librustc/middle/trans/glue.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use back::link::*;
1919
use driver::session;
2020
use lib;
2121
use lib::llvm::{llvm, ValueRef, TypeRef, True};
22-
use lib::llvm::type_to_str;
2322
use middle::trans::adt;
2423
use middle::trans::base::*;
2524
use middle::trans::callee;

0 commit comments

Comments
 (0)