diff options
| author | bors <bors@rust-lang.org> | 2014-06-16 08:16:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-16 08:16:49 +0000 |
| commit | 7ec78053ec5fcabd5f8ca98627dd45bfa5fc4cd4 (patch) | |
| tree | 1ea55f8c25540e7339e27fe9dd79cadbc332634f /src/libsync | |
| parent | 2ef910f71ab83761b1f5f9144621f246622e92d8 (diff) | |
| parent | 89b0e6e12ba2fb24ec0e6655a1130c16eb8d1745 (diff) | |
| download | rust-7ec78053ec5fcabd5f8ca98627dd45bfa5fc4cd4.tar.gz rust-7ec78053ec5fcabd5f8ca98627dd45bfa5fc4cd4.zip | |
auto merge of #14900 : alexcrichton/rust/snapshots, r=huonw
Closes #14898 Closes #14918
Diffstat (limited to 'src/libsync')
| -rw-r--r-- | src/libsync/raw.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsync/raw.rs b/src/libsync/raw.rs index 5df08790c41..c5f452d3e58 100644 --- a/src/libsync/raw.rs +++ b/src/libsync/raw.rs @@ -828,7 +828,7 @@ mod tests { let m = Arc::new(Mutex::new()); let m2 = m.clone(); - let result: result::Result<(), Box<Any:Send>> = task::try(proc() { + let result: result::Result<(), Box<Any + Send>> = task::try(proc() { let _lock = m2.lock(); fail!(); }); @@ -1068,7 +1068,7 @@ mod tests { let x = Arc::new(RWLock::new()); let x2 = x.clone(); - let result: result::Result<(), Box<Any:Send>> = task::try(proc() { + let result: result::Result<(), Box<Any + Send>> = task::try(proc() { lock_rwlock_in_mode(&x2, mode1, || { fail!(); }) |