Skip to content

Commit 6bc1128

Browse files
vadimcnvadimcn
committed
---
yaml --- r: 154569 b: refs/heads/try2 c: 8c994a1 h: refs/heads/master i: 154567: 6952a2f v: v3
1 parent 4d98fa3 commit 6bc1128

File tree

23 files changed

+17
-119
lines changed

23 files changed

+17
-119
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: f66fd2eed10de2acacd8af73c704bf4d140410bb
8+
refs/heads/try2: 8c994a1237d1c79811920cf852d0b801b8518336
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ then
635635
LLVM_VERSION=$($LLVM_CONFIG --version)
636636

637637
case $LLVM_VERSION in
638-
(3.[2-6]*)
638+
(3.[2-5]*)
639639
msg "found ok version of LLVM: $LLVM_VERSION"
640640
;;
641641
(*)

‎branches/try2/src/compiletest/runtest.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ use header;
1717
use procsrv;
1818
use util::logv;
1919
#[cfg(target_os = "windows")]
20-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
2120
use util;
2221

2322
use std::io::File;
@@ -819,7 +818,6 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
819818
}).collect::<Vec<String> >();
820819

821820
#[cfg(target_os = "windows")]
822-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
823821
fn to_lower( s : &str ) -> String {
824822
let i = s.chars();
825823
let c : Vec<char> = i.map( |c| {
@@ -833,7 +831,6 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
833831
}
834832

835833
#[cfg(target_os = "windows")]
836-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
837834
fn prefix_matches( line : &str, prefix : &str ) -> bool {
838835
to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice())
839836
}
@@ -1251,15 +1248,13 @@ fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String {
12511248
}
12521249

12531250
#[cfg(target_os = "windows")]
1254-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
12551251
fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String {
12561252
format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" "))
12571253
}
12581254

12591255
// Build the LD_LIBRARY_PATH variable as it would be seen on the command line
12601256
// for diagnostic purposes
12611257
#[cfg(target_os = "windows")]
1262-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
12631258
fn lib_path_cmd_prefix(path: &str) -> String {
12641259
format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
12651260
}

‎branches/try2/src/compiletest/util.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use common::Config;
1212

1313
#[cfg(target_os = "windows")]
14-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
1514
use std::os::getenv;
1615

1716
/// Conversion table from triple OS name to Rust SYSNAME
@@ -36,7 +35,6 @@ pub fn get_os(triple: &str) -> &'static str {
3635
}
3736

3837
#[cfg(target_os = "windows")]
39-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
4038
pub fn make_new_path(path: &str) -> String {
4139

4240
// Windows just uses PATH as the library search path, so we have to
@@ -50,11 +48,9 @@ pub fn make_new_path(path: &str) -> String {
5048
}
5149

5250
#[cfg(target_os = "windows")]
53-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
5451
pub fn lib_path_env_var() -> &'static str { "PATH" }
5552

5653
#[cfg(target_os = "windows")]
57-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
5854
pub fn path_div() -> &'static str { ";" }
5955

6056
pub fn logv(config: &Config, s: String) {

‎branches/try2/src/etc/mklldeps.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ def run(args):
6868
]
6969

7070
f.write("#[cfg(" + ', '.join(cfg) + ")]\n")
71-
if os == "windows": # NOTE: Remove after snapshot
72-
f.write("#[cfg(stage0, target_arch = \"%s\", target_os = \"win32\")]\n" % (arch,))
7371

7472
version = run([llconfig, '--version']).strip()
7573

‎branches/try2/src/libcollections/priority_queue.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -529,9 +529,10 @@ impl<'a, T> Iterator<&'a T> for Items<'a, T> {
529529
}
530530

531531
impl<T: Ord> FromIterator<T> for PriorityQueue<T> {
532-
fn from_iter<Iter: Iterator<T>>(mut iter: Iter) -> PriorityQueue<T> {
533-
let vec: Vec<T> = iter.collect();
534-
PriorityQueue::from_vec(vec)
532+
fn from_iter<Iter: Iterator<T>>(iter: Iter) -> PriorityQueue<T> {
533+
let mut q = PriorityQueue::new();
534+
q.extend(iter);
535+
q
535536
}
536537
}
537538

‎branches/try2/src/liblibc/lib.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,16 +1357,8 @@ pub mod types {
13571357
pub mod c99 {
13581358
pub type c_longlong = i64;
13591359
pub type c_ulonglong = u64;
1360-
1361-
#[cfg(target_arch = "x86")]
13621360
pub type intptr_t = i32;
1363-
#[cfg(target_arch = "x86_64")]
1364-
pub type intptr_t = i64;
1365-
1366-
#[cfg(target_arch = "x86")]
13671361
pub type uintptr_t = u32;
1368-
#[cfg(target_arch = "x86_64")]
1369-
pub type uintptr_t = u64;
13701362
}
13711363

13721364
pub mod posix88 {

‎branches/try2/src/librustc/middle/borrowck/gather_loans/restrictions.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,18 @@ impl<'a> RestrictionsContext<'a> {
7070
mc::cat_arg(local_id) => {
7171
// R-Variable, locally declared
7272
let lp = Rc::new(LpVar(local_id));
73-
SafeIf(lp.clone(), vec![lp])
73+
SafeIf(lp.clone(), vec!(lp))
7474
}
7575

7676
mc::cat_upvar(upvar_id, _) => {
7777
// R-Variable, captured into closure
7878
let lp = Rc::new(LpUpvar(upvar_id));
79-
SafeIf(lp.clone(), vec![lp])
79+
SafeIf(lp.clone(), vec!(lp))
8080
}
8181

82-
mc::cat_copied_upvar(mc::CopiedUpvar { upvar_id, .. }) => {
83-
// R-Variable, copied/moved into closure
84-
let lp = Rc::new(LpVar(upvar_id));
85-
SafeIf(lp.clone(), vec![lp])
82+
mc::cat_copied_upvar(..) => {
83+
// FIXME(#2152) allow mutation of upvars
84+
Safe
8685
}
8786

8887
mc::cat_downcast(cmt_base) => {

‎branches/try2/src/librustdoc/plugins.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ impl PluginManager {
7474
}
7575

7676
#[cfg(target_os = "windows")]
77-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
7877
fn libname(mut n: String) -> String {
7978
n.push_str(".dll");
8079
n
@@ -86,8 +85,7 @@ fn libname(mut n: String) -> String {
8685
n
8786
}
8887

89-
#[cfg(not(stage0), not(target_os="windows"), not(target_os="macos"))]
90-
#[cfg(stage0, not(target_os="win32"), not(target_os="macos"))] // NOTE: Remove after snapshot
88+
#[cfg(not(target_os="windows"), not(target_os="macos"))]
9189
fn libname(n: String) -> String {
9290
let mut i = String::from_str("lib");
9391
i.push_str(n.as_slice());

‎branches/try2/src/librustrt/args.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ mod imp {
148148
#[cfg(target_os = "macos")]
149149
#[cfg(target_os = "ios")]
150150
#[cfg(target_os = "windows")]
151-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
152151
mod imp {
153152
use core::prelude::*;
154153
use collections::vec::Vec;

‎branches/try2/src/librustrt/libunwind.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ pub type _Unwind_Exception_Cleanup_Fn =
8888
#[cfg(target_os = "linux")]
8989
#[cfg(target_os = "freebsd")]
9090
#[cfg(target_os = "windows")]
91-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
9291
#[link(name = "gcc_s")]
9392
extern {}
9493

‎branches/try2/src/librustrt/stack.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ pub unsafe fn record_sp_limit(limit: uint) {
200200
asm!("movq $0, %fs:112" :: "r"(limit) :: "volatile")
201201
}
202202
#[cfg(target_arch = "x86_64", target_os = "windows")] #[inline(always)]
203-
#[cfg(stage0, target_arch = "x86_64", target_os = "win32")] // NOTE: Remove after snapshot
204203
unsafe fn target_record_sp_limit(limit: uint) {
205204
// see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block
206205
// store this inside of the "arbitrary data slot", but double the size
@@ -229,7 +228,6 @@ pub unsafe fn record_sp_limit(limit: uint) {
229228
asm!("movl $0, %gs:48" :: "r"(limit) :: "volatile")
230229
}
231230
#[cfg(target_arch = "x86", target_os = "windows")] #[inline(always)]
232-
#[cfg(stage0, target_arch = "x86", target_os = "win32")] // NOTE: Remove after snapshot
233231
unsafe fn target_record_sp_limit(limit: uint) {
234232
// see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block
235233
// store this inside of the "arbitrary data slot"
@@ -283,7 +281,6 @@ pub unsafe fn get_sp_limit() -> uint {
283281
return limit;
284282
}
285283
#[cfg(target_arch = "x86_64", target_os = "windows")] #[inline(always)]
286-
#[cfg(stage0, target_arch = "x86_64", target_os = "win32")] // NOTE: Remove after snapshot
287284
unsafe fn target_get_sp_limit() -> uint {
288285
let limit;
289286
asm!("movq %gs:0x28, $0" : "=r"(limit) ::: "volatile");
@@ -320,7 +317,6 @@ pub unsafe fn get_sp_limit() -> uint {
320317
return limit;
321318
}
322319
#[cfg(target_arch = "x86", target_os = "windows")] #[inline(always)]
323-
#[cfg(stage0, target_arch = "x86", target_os = "win32")] // NOTE: Remove after snapshot
324320
unsafe fn target_get_sp_limit() -> uint {
325321
let limit;
326322
asm!("movl %fs:0x14, $0" : "=r"(limit) ::: "volatile");

‎branches/try2/src/librustuv/uvll.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,6 @@ extern {}
733733
extern {}
734734

735735
#[cfg(target_os = "windows")]
736-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
737736
#[link(name = "ws2_32")]
738737
#[link(name = "psapi")]
739738
#[link(name = "iphlpapi")]

‎branches/try2/src/libstd/dynamic_lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ pub mod dl {
279279
}
280280

281281
#[cfg(target_os = "windows")]
282-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
283282
pub mod dl {
284283
use c_str::ToCStr;
285284
use iter::Iterator;

‎branches/try2/src/libstd/os.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1843,7 +1843,6 @@ pub mod consts {
18431843
}
18441844

18451845
#[cfg(target_os = "windows")]
1846-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
18471846
pub mod consts {
18481847
pub use os::arch_consts::ARCH;
18491848

‎branches/try2/src/libsyntax/parse/mod.rs

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -412,21 +412,14 @@ pub fn str_lit(lit: &str) -> String {
412412
loop {
413413
match chars.next() {
414414
Some((i, c)) => {
415+
let em = error(i);
415416
match c {
416417
'\\' => {
417-
let ch = chars.peek().unwrap_or_else(|| {
418-
fail!("{}", error(i).as_slice())
419-
}).val1();
420-
421-
if ch == '\n' {
418+
if chars.peek().expect(em.as_slice()).val1() == '\n' {
422419
eat(&mut chars);
423-
} else if ch == '\r' {
420+
} else if chars.peek().expect(em.as_slice()).val1() == '\r' {
424421
chars.next();
425-
let ch = chars.peek().unwrap_or_else(|| {
426-
fail!("{}", error(i).as_slice())
427-
}).val1();
428-
429-
if ch != '\n' {
422+
if chars.peek().expect(em.as_slice()).val1() != '\n' {
430423
fail!("lexer accepted bare CR");
431424
}
432425
eat(&mut chars);
@@ -440,11 +433,7 @@ pub fn str_lit(lit: &str) -> String {
440433
}
441434
},
442435
'\r' => {
443-
let ch = chars.peek().unwrap_or_else(|| {
444-
fail!("{}", error(i).as_slice())
445-
}).val1();
446-
447-
if ch != '\n' {
436+
if chars.peek().expect(em.as_slice()).val1() != '\n' {
448437
fail!("lexer accepted bare CR");
449438
}
450439
chars.next();

‎branches/try2/src/test/compile-fail/cannot-mutate-captured-non-mut-var.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,4 @@ fn main() {
1212
let x = 1i;
1313
proc() { x = 2; };
1414
//~^ ERROR: cannot assign to immutable captured outer variable in a proc `x`
15-
16-
let s = std::io::stdin();
17-
proc() { s.lines(); };
18-
//~^ ERROR: cannot borrow immutable captured outer variable in a proc `s` as mutable
1915
}

‎branches/try2/src/test/run-pass/dupe-first-attr.rc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ mod hello;
1818
mod hello;
1919

2020
#[cfg(target_os = "windows")]
21-
/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
2221
mod hello;
2322

2423
#[cfg(target_os = "freebsd")]

‎branches/try2/src/test/run-pass/intrinsic-alignment.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ mod m {
4343
}
4444

4545
#[cfg(target_os = "windows")]
46-
/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
4746
mod m {
4847
#[main]
4948
#[cfg(target_arch = "x86")]

‎branches/try2/src/test/run-pass/issue-16671.rs

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎branches/try2/src/test/run-pass/rec-align-u64.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ mod m {
5656
}
5757

5858
#[cfg(target_os = "windows")]
59-
/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
6059
mod m {
6160
#[cfg(target_arch = "x86")]
6261
pub mod m {

‎branches/try2/src/test/run-pass/slowparse-bstring.rs

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎branches/try2/src/test/run-pass/slowparse-string.rs

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)