diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-07-02 11:08:21 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-07-02 11:08:21 -0700 |
| commit | ff1dd44b40a7243f43a8d32ba8bd6026197c320b (patch) | |
| tree | 4460cbf0a917a289d1d3744d9645c5ab131ea9df /src/libtest | |
| parent | aa1163b92de7717eb7c5eba002b4012e0574a7fe (diff) | |
| parent | ca2778ede7c21efc3cf2e4e1152875ec09360770 (diff) | |
| download | rust-ff1dd44b40a7243f43a8d32ba8bd6026197c320b.tar.gz rust-ff1dd44b40a7243f43a8d32ba8bd6026197c320b.zip | |
Merge remote-tracking branch 'origin/master' into 0.11.0-release
Conflicts: src/libstd/lib.rs
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 03773fad9a8..02f7ebc6d21 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -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) |