Skip to content

Commit 9f3c8a9

Browse files
committed
Warning police
1 parent f547a67 commit 9f3c8a9

File tree

25 files changed

+145
-226
lines changed

25 files changed

+145
-226
lines changed

src/compiletest/compiletest.rc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#[allow(vecs_implicitly_copyable)];
1414
#[allow(non_camel_case_types)];
15-
#[allow(deprecated_mode)];
1615
#[allow(deprecated_pattern)];
1716

1817
extern mod std(vers = "0.7-pre");

src/libcore/comm.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Message passing
1313
*/
1414

1515
use cast::{transmute, transmute_mut};
16-
use cast;
1716
use either::{Either, Left, Right};
1817
use kinds::Owned;
1918
use option::{Option, Some, None};
@@ -150,7 +149,7 @@ impl<T: Owned> GenericChan<T> for Chan<T> {
150149
fn send(&self, x: T) {
151150
unsafe {
152151
let mut endp = None;
153-
let mut self_endp = transmute_mut(&self.endp);
152+
let self_endp = transmute_mut(&self.endp);
154153
endp <-> *self_endp;
155154
*self_endp = Some(streamp::client::data(endp.unwrap(), x))
156155
}
@@ -162,7 +161,7 @@ impl<T: Owned> GenericSmartChan<T> for Chan<T> {
162161
fn try_send(&self, x: T) -> bool {
163162
unsafe {
164163
let mut endp = None;
165-
let mut self_endp = transmute_mut(&self.endp);
164+
let self_endp = transmute_mut(&self.endp);
166165
endp <-> *self_endp;
167166
match streamp::client::try_data(endp.unwrap(), x) {
168167
Some(next) => {
@@ -180,7 +179,7 @@ impl<T: Owned> GenericPort<T> for Port<T> {
180179
fn recv(&self) -> T {
181180
unsafe {
182181
let mut endp = None;
183-
let mut self_endp = transmute_mut(&self.endp);
182+
let self_endp = transmute_mut(&self.endp);
184183
endp <-> *self_endp;
185184
let streamp::data(x, endp) = recv(endp.unwrap());
186185
*self_endp = Some(endp);
@@ -192,7 +191,7 @@ impl<T: Owned> GenericPort<T> for Port<T> {
192191
fn try_recv(&self) -> Option<T> {
193192
unsafe {
194193
let mut endp = None;
195-
let mut self_endp = transmute_mut(&self.endp);
194+
let self_endp = transmute_mut(&self.endp);
196195
endp <-> *self_endp;
197196
match try_recv(endp.unwrap()) {
198197
Some(streamp::data(x, endp)) => {
@@ -210,7 +209,7 @@ impl<T: Owned> Peekable<T> for Port<T> {
210209
fn peek(&self) -> bool {
211210
unsafe {
212211
let mut endp = None;
213-
let mut self_endp = transmute_mut(&self.endp);
212+
let self_endp = transmute_mut(&self.endp);
214213
endp <-> *self_endp;
215214
let peek = match endp {
216215
Some(ref mut endp) => peek(endp),
@@ -224,12 +223,10 @@ impl<T: Owned> Peekable<T> for Port<T> {
224223
225224
impl<T: Owned> Selectable for Port<T> {
226225
fn header(&mut self) -> *mut PacketHeader {
227-
unsafe {
228226
match self.endp {
229227
Some(ref mut endp) => endp.header(),
230228
None => fail!(~"peeking empty stream")
231229
}
232-
}
233230
}
234231
}
235232
@@ -263,7 +260,7 @@ pub impl<T: Owned> PortSet<T> {
263260
impl<T:Owned> GenericPort<T> for PortSet<T> {
264261
fn try_recv(&self) -> Option<T> {
265262
unsafe {
266-
let mut self_ports = transmute_mut(&self.ports);
263+
let self_ports = transmute_mut(&self.ports);
267264
let mut result = None;
268265
// we have to swap the ports array so we aren't borrowing
269266
// aliasable mutable memory.
@@ -358,7 +355,7 @@ pub mod oneshot {
358355
pub fn init<T: Owned>() -> (client::Oneshot<T>, server::Oneshot<T>) {
359356
pub use core::pipes::HasBuffer;
360357
361-
let mut buffer = ~::core::pipes::Buffer {
358+
let buffer = ~::core::pipes::Buffer {
362359
header: ::core::pipes::BufferHeader(),
363360
data: __Buffer {
364361
Oneshot: ::core::pipes::mk_packet::<Oneshot<T>>()

src/libcore/core.rc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ they contained the following prologue:
6161
#[no_core];
6262

6363
#[deny(non_camel_case_types)];
64-
#[allow(deprecated_mutable_fields)];
6564

6665
// Make core testable by not duplicating lang items. See #2912
6766
#[cfg(test)] extern mod realcore(name = "core", vers = "0.7-pre");

src/libcore/pipes.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ pub fn send<T,Tbuffer>(mut p: SendPacketBuffered<T,Tbuffer>,
347347
payload: T)
348348
-> bool {
349349
let header = p.header();
350-
let mut p_ = p.unwrap();
350+
let p_ = p.unwrap();
351351
let p = unsafe { &mut *p_ };
352352
assert!(ptr::to_unsafe_ptr(&(p.header)) == header);
353353
assert!(p.payload.is_none());
@@ -404,10 +404,8 @@ a message, or `Some(T)` if a message was received.
404404
*/
405405
pub fn try_recv<T:Owned,Tbuffer:Owned>(mut p: RecvPacketBuffered<T, Tbuffer>)
406406
-> Option<T> {
407-
let mut p_ = p.unwrap();
408-
let mut p = unsafe {
409-
&mut *p_
410-
};
407+
let p_ = p.unwrap();
408+
let p = unsafe { &mut *p_ };
411409
412410
do (|| {
413411
try_recv_(p)

src/libcore/reflect.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,6 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
409409
disr_val: int,
410410
n_fields: uint,
411411
name: &str) -> bool {
412-
self.inner.push_ptr(); // NOTE remove after next snapshot
413412
if ! self.inner.visit_enter_enum_variant(variant, disr_val,
414413
n_fields, name) {
415414
return false;
@@ -433,7 +432,6 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
433432
n_fields, name) {
434433
return false;
435434
}
436-
self.inner.pop_ptr(); // NOTE remove after next snapshot
437435
true
438436
}
439437

src/libcore/rt/uv/net.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ pub impl StreamWatcher {
152152
extern fn close_cb(handle: *uvll::uv_stream_t) {
153153
let mut stream_watcher: StreamWatcher = NativeHandle::from_native_handle(handle);
154154
{
155-
let mut data = get_watcher_data(&mut stream_watcher);
156-
data.close_cb.swap_unwrap()();
155+
get_watcher_data(&mut stream_watcher).close_cb.swap_unwrap()();
157156
}
158157
drop_watcher_data(&mut stream_watcher);
159158
unsafe { free_handle(handle as *c_void) }
@@ -214,8 +213,7 @@ pub impl TcpWatcher {
214213
assert!(get_watcher_data(self).connect_cb.is_none());
215214
get_watcher_data(self).connect_cb = Some(cb);
216215

217-
let mut connect_watcher = ConnectRequest::new();
218-
let connect_handle = connect_watcher.native_handle();
216+
let connect_handle = ConnectRequest::new().native_handle();
219217
match address {
220218
Ipv4(*) => {
221219
do ip4_as_uv_ip4(address) |addr| {

src/libcore/rt/uvio.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ impl Drop for UvEventLoop {
4646
let self = unsafe {
4747
transmute::<&UvEventLoop, &mut UvEventLoop>(self)
4848
};
49-
let mut uv_loop = self.uvio.uv_loop();
50-
uv_loop.close();
49+
self.uvio.uv_loop().close();
5150
}
5251
}
5352

@@ -189,9 +188,8 @@ impl TcpListener for UvTcpListener {
189188
let maybe_stream = if status.is_none() {
190189
let mut server_stream_watcher = server_stream_watcher;
191190
let mut loop_ = loop_from_watcher(&server_stream_watcher);
192-
let mut client_tcp_watcher = TcpWatcher::new(&mut loop_);
193-
let client_tcp_watcher = client_tcp_watcher.as_stream();
194-
// XXX: Need's to be surfaced in interface
191+
let client_tcp_watcher = TcpWatcher::new(&mut loop_).as_stream();
192+
// XXX: Needs to be surfaced in interface
195193
server_stream_watcher.accept(client_tcp_watcher);
196194
Some(~UvStream::new(client_tcp_watcher))
197195
} else {

src/libcore/task/spawn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ fn gen_child_taskgroup(linked: bool, supervised: bool)
467467
/*##################################################################*
468468
* Step 1. Get spawner's taskgroup info.
469469
*##################################################################*/
470-
let mut spawner_group: @@mut TCB =
470+
let spawner_group: @@mut TCB =
471471
match local_get(OldHandle(spawner), taskgroup_key!()) {
472472
None => {
473473
// Main task, doing first spawn ever. Lazily initialise

src/librustc/middle/borrowck/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
/*! See doc.rs for a thorough explanation of the borrow checker */
1212

13-
use core;
1413
use core::prelude::*;
1514

1615
use mc = middle::mem_categorization;
@@ -22,6 +21,7 @@ use middle::dataflow::DataFlowOperator;
2221
use util::common::stmt_set;
2322
use util::ppaux::{note_and_explain_region, Repr};
2423

24+
use core;
2525
use core::hashmap::{HashSet, HashMap};
2626
use core::io;
2727
use core::result::{Result};

src/librustc/middle/mem_categorization.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -571,8 +571,6 @@ pub impl mem_categorization_ctxt {
571571
}
572572
}
573573

574-
/// The `field_id` parameter is the ID of the enclosing expression or
575-
/// pattern. It is used to determine which variant of an enum is in use.
576574
fn cat_field<N:ast_node>(&self,
577575
node: N,
578576
base_cmt: cmt,

src/librustc/middle/resolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ use syntax::ast_util::{def_id_of_def, local_def};
6060
use syntax::ast_util::{path_to_ident, walk_pat, trait_method_to_ty_method};
6161
use syntax::ast_util::{Privacy, Public, Private};
6262
use syntax::ast_util::{variant_visibility_to_privacy, visibility_to_privacy};
63-
use syntax::attr::{attr_metas, contains_name, attrs_contains_name};
63+
use syntax::attr::{attr_metas, contains_name};
6464
use syntax::parse::token::ident_interner;
6565
use syntax::parse::token::special_idents;
6666
use syntax::print::pprust::path_to_str;

src/librustc/middle/typeck/infer/region_inference.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,12 +544,12 @@ use middle::typeck::infer::cres;
544544
use util::common::indenter;
545545
use util::ppaux::note_and_explain_region;
546546

547+
use core;
547548
use core::cell::{Cell, empty_cell};
548549
use core::hashmap::{HashMap, HashSet};
549550
use core::to_bytes;
550551
use core::uint;
551552
use core::vec;
552-
use core;
553553
use syntax::codemap::span;
554554
use syntax::ast;
555555

0 commit comments

Comments
 (0)