diff options
| author | bors <bors@rust-lang.org> | 2015-06-30 23:46:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-30 23:46:57 +0000 |
| commit | bf3c979ec31300e38c1607d605cf47f231bf6480 (patch) | |
| tree | 7f6589cb3d62ea6313d1e43c22ba0f55fabe37d1 /src/test | |
| parent | dc309d79e9cbe473d68ad1292f5df73000a22891 (diff) | |
| parent | 08f9b98e57f2332da522ebf98c74a315211b98ac (diff) | |
| download | rust-bf3c979ec31300e38c1607d605cf47f231bf6480.tar.gz rust-bf3c979ec31300e38c1607d605cf47f231bf6480.zip | |
Auto merge of #26696 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #26373, #26506, #26580, #26622, #26627, #26651, #26678, #26692 - Failed merges:
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compile-fail/no-send-res-ports.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/issue-2718.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/compile-fail/no-send-res-ports.rs b/src/test/compile-fail/no-send-res-ports.rs index b80d15bb6f3..60b2d22079e 100644 --- a/src/test/compile-fail/no-send-res-ports.rs +++ b/src/test/compile-fail/no-send-res-ports.rs @@ -20,7 +20,7 @@ fn main() { _x: Port<()>, } - impl Drop for foo { + impl Drop for foo { fn drop(&mut self) {} } diff --git a/src/test/run-pass/issue-2718.rs b/src/test/run-pass/issue-2718.rs index 1a139bdf0fb..2da2f1e82a6 100644 --- a/src/test/run-pass/issue-2718.rs +++ b/src/test/run-pass/issue-2718.rs @@ -165,7 +165,7 @@ pub mod pipes { p: Option<*const packet<T>>, } - impl<T:Send> Drop for send_packet<T> { + impl<T:Send> Drop for send_packet<T> { fn drop(&mut self) { unsafe { if self.p != None { @@ -194,7 +194,7 @@ pub mod pipes { p: Option<*const packet<T>>, } - impl<T:Send> Drop for recv_packet<T> { + impl<T:Send> Drop for recv_packet<T> { fn drop(&mut self) { unsafe { if self.p != None { |