Test fixes and rebase conflicts

This commit is contained in:
Alex Crichton 2014-12-21 00:12:56 -08:00
parent dbeef0edb2
commit fb7c08876e
9 changed files with 18 additions and 13 deletions

View File

@ -285,7 +285,7 @@ tidy:
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
$(Q)echo $(ALL_HS) \
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
$(Q)find $(S)src -type f -perm /a+x \
$(Q)find $(S)src -type f -perm +a+x \
-not -name '*.rs' -and -not -name '*.py' \
-and -not -name '*.sh' \
| grep '^$(S)src/jemalloc' -v \

View File

@ -33,36 +33,37 @@
//!
//! ```
//! use std::sync::Arc;
//! use std::thread::Thread;
//!
//! let five = Arc::new(5i);
//!
//! for i in range(0u, 10) {
//! let five = five.clone();
//!
//! spawn(move || {
//! Thread::spawn(move || {
//! println!("{}", five);
//! });
//! }).detach();
//! }
//! ```
//!
//! Sharing mutable data safely between tasks with a `Mutex`:
//!
//! ```
//! use std::sync::Arc;
//! use std::sync::Mutex;
//! use std::sync::{Arc, Mutex};
//! use std::thread::Thread;
//!
//! let five = Arc::new(Mutex::new(5i));
//!
//! for _ in range(0u, 10) {
//! let five = five.clone();
//!
//! spawn(move || {
//! Thread::spawn(move || {
//! let mut number = five.lock();
//!
//! number += 1;
//! *number += 1;
//!
//! println!("{}", *number); // prints 6
//! });
//! }).detach();
//! }
//! ```

View File

@ -53,6 +53,7 @@ use core::cmp::max;
use core::default::Default;
use core::fmt;
use core::hash::{mod, Hash};
use core::iter::repeat;
use core::kinds::marker::{ContravariantLifetime, InvariantType};
use core::mem;
use core::num::{Int, UnsignedInt};

View File

@ -131,7 +131,7 @@ impl<'v> Visitor<'v> for Annotator {
}
fn visit_foreign_item(&mut self, i: &ast::ForeignItem) {
self.annotate(i.id, &i.attrs, |_| {});
self.annotate(i.id, true, &i.attrs, |_| {});
}
}

View File

@ -535,6 +535,8 @@ pub fn parameterized<'tcx>(cx: &ctxt<'tcx>,
base,
if strs[0].starts_with("(") && strs[0].ends_with(",)") {
strs[0][1 .. strs[0].len() - 2] // Remove '(' and ',)'
} else if strs[0].starts_with("(") && strs[0].ends_with(")") {
strs[0][1 .. strs[0].len() - 1] // Remove '(' and ')'
} else {
strs[0][]
},

View File

@ -1473,7 +1473,6 @@ mod test_map {
use super::HashMap;
use super::Entry::{Occupied, Vacant};
use cmp::Equiv;
use hash;
use iter::{range_inclusive, range_step_inclusive};
use cell::RefCell;

View File

@ -3,7 +3,7 @@ S 2014-12-20 8443b09
linux-i386 3daf531aed03f5769402f2fef852377e2838db98
linux-x86_64 4f3c8b092dd4fe159d6f25a217cf62e0e899b365
macos-i386 2a3e647b9c400505bd49cfe56091e866c83574ca
macos-x86_64 78f952a3e77a9921a23c957bb133131017b57324
macos-x86_64 5e730efc34d79a33f464a87686c10eace0760a2e
winnt-i386 8ea056043de82096d5ce5abc98c8c74ebac7e77d
winnt-x86_64 9804100dafae9b64a76e0ea7e1be157719dae151

View File

@ -14,8 +14,8 @@ fn bar(_s: u32) { }
fn main() {
foo(1*(1 as int));
//~^ ERROR: mismatched types: expected `i16`, found `int` (expected `i16`, found `int`)
//~^ ERROR: mismatched types: expected `i16`, found `int` (expected i16, found int)
bar(1*(1 as uint));
//~^ ERROR: mismatched types: expected `u32`, found `uint` (expected `u32`, found `uint`)
//~^ ERROR: mismatched types: expected `u32`, found `uint` (expected u32, found uint)
}

View File

@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// ignore-windows currently windows requires UTF-8 for spawning processes
use std::io::Command;
use std::os;