rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 0.11.0-release

Browse Source 
Conflicts:
	src/libstd/lib.rs
This commit is contained in:
Alex Crichton
2014-07-02 11:08:21 -07:00
parent aa1163b92d ca2778ede7
commit ff1dd44b40
715 changed files with 10358 additions and 8207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtest/lib.rs
View File

@@ -474,7 +474,7 @@ pub enum TestResult {
}
enum OutputLocation<T> {
Pretty(Box<term::Terminal<Box<Writer + Send>> + Send>),
Pretty(Box<term::Terminal<term::WriterWrapper> + Send>),
Raw(T),
}
@@ -1104,7 +1104,7 @@ fn calc_result(desc: &TestDesc, task_succeeded: bool) -> TestResult {
impl ToJson for Metric {
fn to_json(&self) -> json::Json {
let mut map = box TreeMap::new();
let mut map = TreeMap::new();
map.insert("value".to_string(), json::Number(self.value));
map.insert("noise".to_string(), json::Number(self.noise));
json::Object(map)