From ed4186446492e141a4dc37829dc9599133d00dd0 Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Thu, 9 May 2013 13:27:24 -0700 Subject: Warning police --- src/libstd/ebml.rs | 7 ------- src/libstd/fileinput.rs | 21 ++++++++------------- src/libstd/future.rs | 40 ++-------------------------------------- src/libstd/json.rs | 13 ------------- src/libstd/net_tcp.rs | 24 +++++++++++------------- src/libstd/num/bigint.rs | 2 -- src/libstd/std.rc | 3 --- src/libstd/test.rs | 5 +++-- 8 files changed, 24 insertions(+), 91 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs index a57a16fb87d..98618e4928b 100644 --- a/src/libstd/ebml.rs +++ b/src/libstd/ebml.rs @@ -634,13 +634,6 @@ pub mod writer { use core::vec; // ebml writing - #[cfg(stage0)] - pub struct Encoder { - writer: @io::Writer, - priv mut size_positions: ~[uint], - } - - #[cfg(not(stage0))] pub struct Encoder { writer: @io::Writer, priv size_positions: ~[uint], diff --git a/src/libstd/fileinput.rs b/src/libstd/fileinput.rs index 2c5cbc1cbf9..4e205b50014 100644 --- a/src/libstd/fileinput.rs +++ b/src/libstd/fileinput.rs @@ -94,8 +94,6 @@ total line count). } */ -#[allow(deprecated_mutable_fields)]; - use core::io::ReaderUtil; /** @@ -212,8 +210,8 @@ impl FileInput { pub fn next_file(&self) -> bool { // No more files - // Compiler whines about "illegal borrow unless pure" for - // files.is_empty() + // unsafe block can be removed after the next snapshot + // (next one after 2013-05-03) if unsafe { self.fi.files.is_empty() } { self.fi.current_reader = None; return false; @@ -337,7 +335,8 @@ impl io::Reader for FileInput { fn eof(&self) -> bool { // we've run out of files, and current_reader is either None or eof. - // compiler whines about illegal borrows for files.is_empty() + // unsafe block can be removed after the next snapshot + // (next one after 2013-05-03) (unsafe { self.fi.files.is_empty() }) && match self.fi.current_reader { None => true, Some(r) => r.eof() } @@ -380,8 +379,7 @@ Fails when attempting to read from a file that can't be opened. */ #[cfg(stage0)] pub fn input(f: &fn(&str) -> bool) { - let mut i = FileInput::from_args(); - i.each_line(f); + FileInput::from_args().each_line(f); } /** Iterate directly over the command line arguments (no arguments implies @@ -404,8 +402,7 @@ Fails when attempting to read from a file that can't be opened. */ #[cfg(stage0)] pub fn input_state(f: &fn(&str, FileInputState) -> bool) { - let mut i = FileInput::from_args(); - i.each_line_state(f); + FileInput::from_args().each_line_state(f); } /** Iterate directly over the command line arguments (no arguments @@ -427,8 +424,7 @@ Fails when attempting to read from a file that can't be opened. */ #[cfg(stage0)] pub fn input_vec(files: ~[Option], f: &fn(&str) -> bool) { - let mut i = FileInput::from_vec(files); - i.each_line(f); + FileInput::from_vec(files).each_line(f); } /** Iterate over a vector of files (an empty vector implies just `stdin`). @@ -450,8 +446,7 @@ Fails when attempting to read from a file that can't be opened. #[cfg(stage0)] pub fn input_vec_state(files: ~[Option], f: &fn(&str, FileInputState) -> bool) { - let mut i = FileInput::from_vec(files); - i.each_line_state(f); + FileInput::from_vec(files).each_line_state(f); } /** Iterate over a vector of files (an empty vector implies just `stdin`) diff --git a/src/libstd/future.rs b/src/libstd/future.rs index ac23ea1a6e2..9906be13cb9 100644 --- a/src/libstd/future.rs +++ b/src/libstd/future.rs @@ -29,17 +29,12 @@ use core::task; use core::util::replace; #[doc = "The future type"] -#[cfg(stage0)] -pub struct Future { - priv mut state: FutureState, -} - -#[doc = "The future type"] -#[cfg(not(stage0))] pub struct Future { priv state: FutureState, } +// n.b. It should be possible to get rid of this. +// Add a test, though -- tjc // FIXME(#2829) -- futures should not be copyable, because they close // over ~fn's that have pipes and so forth within! #[unsafe_destructor] @@ -62,37 +57,6 @@ pub impl Future { } pub impl Future { - #[cfg(stage0)] - fn get_ref<'a>(&'a self) -> &'a A { - /*! - * Executes the future's closure and then returns a borrowed - * pointer to the result. The borrowed pointer lasts as long as - * the future. - */ - unsafe { - { - match self.state { - Forced(ref mut v) => { return cast::transmute(v); } - Evaluating => fail!(~"Recursive forcing of future!"), - Pending(_) => {} - } - } - { - let state = replace(&mut self.state, Evaluating); - match state { - Forced(_) | Evaluating => fail!(~"Logic error."), - Pending(f) => { - self.state = Forced(f()); - cast::transmute(self.get_ref()) - } - } - } - } - } - - #[cfg(stage1)] - #[cfg(stage2)] - #[cfg(stage3)] fn get_ref<'a>(&'a mut self) -> &'a A { /*! * Executes the future's closure and then returns a borrowed diff --git a/src/libstd/json.rs b/src/libstd/json.rs index c815c9dd480..2acbcf5c7ec 100644 --- a/src/libstd/json.rs +++ b/src/libstd/json.rs @@ -220,13 +220,6 @@ impl serialize::Encoder for Encoder { } } -#[cfg(stage0)] -pub struct PrettyEncoder { - priv wr: @io::Writer, - priv mut indent: uint, -} - -#[cfg(not(stage0))] pub struct PrettyEncoder { priv wr: @io::Writer, priv indent: uint, @@ -845,12 +838,6 @@ pub fn from_str(s: &str) -> Result { } } -#[cfg(stage0)] -pub struct Decoder { - priv mut stack: ~[Json], -} - -#[cfg(not(stage0))] pub struct Decoder { priv stack: ~[Json], } diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs index 7e47106977f..20e1a272910 100644 --- a/src/libstd/net_tcp.rs +++ b/src/libstd/net_tcp.rs @@ -972,19 +972,17 @@ impl io::Reader for TcpSocketBuf { /// Implementation of `io::Reader` trait for a buffered `net::tcp::TcpSocket` impl io::Writer for TcpSocketBuf { pub fn write(&self, data: &[u8]) { - unsafe { - let socket_data_ptr: *TcpSocketData = - &(*((*(self.data)).sock).socket_data); - let w_result = write_common_impl(socket_data_ptr, - vec::slice(data, - 0, - data.len()).to_vec()); - if w_result.is_err() { - let err_data = w_result.get_err(); - debug!( - "ERROR sock_buf as io::writer.writer err: %? %?", - err_data.err_name, err_data.err_msg); - } + let socket_data_ptr: *TcpSocketData = + &(*((*(self.data)).sock).socket_data); + let w_result = write_common_impl(socket_data_ptr, + vec::slice(data, + 0, + data.len()).to_vec()); + if w_result.is_err() { + let err_data = w_result.get_err(); + debug!( + "ERROR sock_buf as io::writer.writer err: %? %?", + err_data.err_name, err_data.err_msg); } } fn seek(&self, dist: int, seek: io::SeekStyle) { diff --git a/src/libstd/num/bigint.rs b/src/libstd/num/bigint.rs index e64e97adfa3..7b39b200079 100644 --- a/src/libstd/num/bigint.rs +++ b/src/libstd/num/bigint.rs @@ -16,8 +16,6 @@ A BigUint is represented as an array of BigDigits. A BigInt is a combination of BigUint and Sign. */ -#[deny(deprecated_mutable_fields)]; - use core::cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater}; use core::num::{IntConvertible, Zero, One, ToStrRadix, FromStrRadix}; diff --git a/src/libstd/std.rc b/src/libstd/std.rc index 70bd5ceef98..915aab59a71 100644 --- a/src/libstd/std.rc +++ b/src/libstd/std.rc @@ -28,9 +28,6 @@ not required in or otherwise suitable for the core library. #[deny(non_camel_case_types)]; -// Allow mutable fields only in stage0. -#[warn(deprecated_mutable_fields)]; - pub mod uv_ll; // General io and system-services modules diff --git a/src/libstd/test.rs b/src/libstd/test.rs index c320bcea77c..bb90b783444 100644 --- a/src/libstd/test.rs +++ b/src/libstd/test.rs @@ -410,9 +410,10 @@ type MonitorMsg = (TestDesc, TestResult); fn run_tests(opts: &TestOpts, tests: ~[TestDescAndFn], callback: @fn(e: TestEvent)) { - let mut filtered_tests = filter_tests(opts, tests); - let filtered_descs = filtered_tests.map(|t| copy t.desc); + let filtered_tests = filter_tests(opts, tests); + let filtered_descs = filtered_tests.map(|t| t.desc); + callback(TeFiltered(filtered_descs)); let (filtered_tests, filtered_benchs) = -- cgit 1.4.1-3-g733a5 From a279d6510251ebd3956c74ffe4b12bd49074da9c Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Sat, 11 May 2013 06:07:21 -0400 Subject: clean up the last bit of warnings --- src/libcore/condition.rs | 1 - src/libcore/os.rs | 1 - src/libcore/rand.rs | 1 - src/librustc/middle/borrowck/mod.rs | 3 ++- src/librustc/middle/ty.rs | 3 ++- src/librustc/middle/typeck/infer/region_inference.rs | 3 ++- src/libstd/fileinput.rs | 8 ++++---- src/libstd/test.rs | 2 +- src/libsyntax/ast.rs | 1 - 9 files changed, 11 insertions(+), 12 deletions(-) (limited to 'src/libstd') diff --git a/src/libcore/condition.rs b/src/libcore/condition.rs index 75c6cf0e969..baa6722b193 100644 --- a/src/libcore/condition.rs +++ b/src/libcore/condition.rs @@ -11,7 +11,6 @@ /*! Condition handling */ use prelude::*; -use task; use local_data::{local_data_pop, local_data_set}; // helper for transmutation, shown below. diff --git a/src/libcore/os.rs b/src/libcore/os.rs index 88b13d0ff59..030b7ec3e42 100644 --- a/src/libcore/os.rs +++ b/src/libcore/os.rs @@ -36,7 +36,6 @@ use option::{Some, None}; use prelude::*; use ptr; use str; -use task; use uint; use unstable::finally::Finally; use vec; diff --git a/src/libcore/rand.rs b/src/libcore/rand.rs index addc92c3a00..daf0b9d094a 100644 --- a/src/libcore/rand.rs +++ b/src/libcore/rand.rs @@ -43,7 +43,6 @@ fn main () { use int; use prelude::*; use str; -use task; use u32; use uint; use util; diff --git a/src/librustc/middle/borrowck/mod.rs b/src/librustc/middle/borrowck/mod.rs index a6105534077..fbc186a6fd4 100644 --- a/src/librustc/middle/borrowck/mod.rs +++ b/src/librustc/middle/borrowck/mod.rs @@ -21,7 +21,8 @@ use middle::dataflow::DataFlowOperator; use util::common::stmt_set; use util::ppaux::{note_and_explain_region, Repr}; -use core; +#[cfg(stage0)] +use core; // NOTE: this can be removed after the next snapshot use core::hashmap::{HashSet, HashMap}; use core::io; use core::result::{Result}; diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 7e355f7192f..f5adb2fe108 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -28,7 +28,8 @@ use util::ppaux::Repr; use util::common::{indenter}; use util::enum_set::{EnumSet, CLike}; -use core; +#[cfg(stage0)] +use core; // NOTE: this can be removed after the next snapshot use core::ptr::to_unsafe_ptr; use core::to_bytes; use core::hashmap::{HashMap, HashSet}; diff --git a/src/librustc/middle/typeck/infer/region_inference.rs b/src/librustc/middle/typeck/infer/region_inference.rs index 11a7aafe1cd..96e289bc497 100644 --- a/src/librustc/middle/typeck/infer/region_inference.rs +++ b/src/librustc/middle/typeck/infer/region_inference.rs @@ -544,7 +544,8 @@ use middle::typeck::infer::cres; use util::common::indenter; use util::ppaux::note_and_explain_region; -use core; +#[cfg(stage0)] +use core; // NOTE: this can be removed after next snapshot use core::cell::{Cell, empty_cell}; use core::hashmap::{HashMap, HashSet}; use core::to_bytes; diff --git a/src/libstd/fileinput.rs b/src/libstd/fileinput.rs index 4e205b50014..c3622fad53b 100644 --- a/src/libstd/fileinput.rs +++ b/src/libstd/fileinput.rs @@ -389,7 +389,7 @@ Fails when attempting to read from a file that can't be opened. */ #[cfg(not(stage0))] pub fn input(f: &fn(&str) -> bool) -> bool { - let mut i = FileInput::from_args(); + let i = FileInput::from_args(); i.each_line(f) } @@ -413,7 +413,7 @@ Fails when attempting to read from a file that can't be opened. */ #[cfg(not(stage0))] pub fn input_state(f: &fn(&str, FileInputState) -> bool) -> bool { - let mut i = FileInput::from_args(); + let i = FileInput::from_args(); i.each_line_state(f) } @@ -433,7 +433,7 @@ Fails when attempting to read from a file that can't be opened. */ #[cfg(not(stage0))] pub fn input_vec(files: ~[Option], f: &fn(&str) -> bool) -> bool { - let mut i = FileInput::from_vec(files); + let i = FileInput::from_vec(files); i.each_line(f) } @@ -457,7 +457,7 @@ Fails when attempting to read from a file that can't be opened. #[cfg(not(stage0))] pub fn input_vec_state(files: ~[Option], f: &fn(&str, FileInputState) -> bool) -> bool { - let mut i = FileInput::from_vec(files); + let i = FileInput::from_vec(files); i.each_line_state(f) } diff --git a/src/libstd/test.rs b/src/libstd/test.rs index bb90b783444..71cbc0d7a6a 100644 --- a/src/libstd/test.rs +++ b/src/libstd/test.rs @@ -412,7 +412,7 @@ fn run_tests(opts: &TestOpts, callback: @fn(e: TestEvent)) { let filtered_tests = filter_tests(opts, tests); - let filtered_descs = filtered_tests.map(|t| t.desc); + let filtered_descs = filtered_tests.map(|t| copy t.desc); callback(TeFiltered(filtered_descs)); diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 8aa59fd1775..5daa0de2272 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -16,7 +16,6 @@ use opt_vec::OptVec; use core::cast; use core::option::{None, Option, Some}; -use core::task; use core::to_bytes; use core::to_str::ToStr; use std::serialize::{Encodable, Decodable, Encoder, Decoder}; -- cgit 1.4.1-3-g733a5