Skip to content

Commit 9e789c5

Browse files
emberiancatamorphism
authored andcommitted
---
yaml --- r: 58352 b: refs/heads/auto c: a279d65 h: refs/heads/master v: v3
1 parent b483bd6 commit 9e789c5

File tree

10 files changed

+12
-13
lines changed

10 files changed

+12
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: ed4186446492e141a4dc37829dc9599133d00dd0
17+
refs/heads/auto: a279d6510251ebd3956c74ffe4b12bd49074da9c
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/condition.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
/*! Condition handling */
1212

1313
use prelude::*;
14-
use task;
1514
use local_data::{local_data_pop, local_data_set};
1615

1716
// helper for transmutation, shown below.

branches/auto/src/libcore/os.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ use option::{Some, None};
3636
use prelude::*;
3737
use ptr;
3838
use str;
39-
use task;
4039
use uint;
4140
use unstable::finally::Finally;
4241
use vec;

branches/auto/src/libcore/rand.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ fn main () {
4343
use int;
4444
use prelude::*;
4545
use str;
46-
use task;
4746
use u32;
4847
use uint;
4948
use util;

branches/auto/src/librustc/middle/borrowck/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ use middle::dataflow::DataFlowOperator;
2121
use util::common::stmt_set;
2222
use util::ppaux::{note_and_explain_region, Repr};
2323

24-
use core;
24+
#[cfg(stage0)]
25+
use core; // NOTE: this can be removed after the next snapshot
2526
use core::hashmap::{HashSet, HashMap};
2627
use core::io;
2728
use core::result::{Result};

branches/auto/src/librustc/middle/ty.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ use util::ppaux::Repr;
2828
use util::common::{indenter};
2929
use util::enum_set::{EnumSet, CLike};
3030

31-
use core;
31+
#[cfg(stage0)]
32+
use core; // NOTE: this can be removed after the next snapshot
3233
use core::ptr::to_unsafe_ptr;
3334
use core::to_bytes;
3435
use core::hashmap::{HashMap, HashSet};

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

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

547-
use core;
547+
#[cfg(stage0)]
548+
use core; // NOTE: this can be removed after next snapshot
548549
use core::cell::{Cell, empty_cell};
549550
use core::hashmap::{HashMap, HashSet};
550551
use core::to_bytes;

branches/auto/src/libstd/fileinput.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ Fails when attempting to read from a file that can't be opened.
389389
*/
390390
#[cfg(not(stage0))]
391391
pub fn input(f: &fn(&str) -> bool) -> bool {
392-
let mut i = FileInput::from_args();
392+
let i = FileInput::from_args();
393393
i.each_line(f)
394394
}
395395
@@ -413,7 +413,7 @@ Fails when attempting to read from a file that can't be opened.
413413
*/
414414
#[cfg(not(stage0))]
415415
pub fn input_state(f: &fn(&str, FileInputState) -> bool) -> bool {
416-
let mut i = FileInput::from_args();
416+
let i = FileInput::from_args();
417417
i.each_line_state(f)
418418
}
419419
@@ -433,7 +433,7 @@ Fails when attempting to read from a file that can't be opened.
433433
*/
434434
#[cfg(not(stage0))]
435435
pub fn input_vec(files: ~[Option<Path>], f: &fn(&str) -> bool) -> bool {
436-
let mut i = FileInput::from_vec(files);
436+
let i = FileInput::from_vec(files);
437437
i.each_line(f)
438438
}
439439
@@ -457,7 +457,7 @@ Fails when attempting to read from a file that can't be opened.
457457
#[cfg(not(stage0))]
458458
pub fn input_vec_state(files: ~[Option<Path>],
459459
f: &fn(&str, FileInputState) -> bool) -> bool {
460-
let mut i = FileInput::from_vec(files);
460+
let i = FileInput::from_vec(files);
461461
i.each_line_state(f)
462462
}
463463

branches/auto/src/libstd/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ fn run_tests(opts: &TestOpts,
412412
callback: @fn(e: TestEvent)) {
413413
414414
let filtered_tests = filter_tests(opts, tests);
415-
let filtered_descs = filtered_tests.map(|t| t.desc);
415+
let filtered_descs = filtered_tests.map(|t| copy t.desc);
416416
417417
callback(TeFiltered(filtered_descs));
418418

branches/auto/src/libsyntax/ast.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use opt_vec::OptVec;
1616

1717
use core::cast;
1818
use core::option::{None, Option, Some};
19-
use core::task;
2019
use core::to_bytes;
2120
use core::to_str::ToStr;
2221
use std::serialize::{Encodable, Decodable, Encoder, Decoder};

0 commit comments

Comments
 (0)