summaryrefslogtreecommitdiff
path: root/src/session.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-17 15:23:18 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-17 15:23:18 -0800
commite2b22f1665ecfb776e17ced93473cf5695ed00d4 (patch)
treed43a5b3dca2f6adc8507ad79a33df8c4a215f8a9 /src/session.rs
parentea6e306c68450a88024bbc615361144297703ed0 (diff)
downloadssh2-rs-e2b22f1665ecfb776e17ced93473cf5695ed00d4.zip
Update to rust master
Diffstat (limited to 'src/session.rs')
-rw-r--r--src/session.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/session.rs b/src/session.rs
index a98e63a..3ee43f5 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -1,6 +1,5 @@
use std::ffi::CString;
use std::io;
-use std::marker;
use std::mem;
use std::slice;
use std::str;
@@ -16,9 +15,10 @@ use {MethodType, Agent, Channel, Listener, HashType, KnownHosts, Sftp};
/// (via the `handshake` method).
pub struct Session {
raw: *mut raw::LIBSSH2_SESSION,
- marker: marker::NoSync,
}
+unsafe impl Send for Session {}
+
impl Session {
/// Initializes an SSH session object.
pub fn new() -> Option<Session> {
@@ -36,7 +36,6 @@ impl Session {
pub unsafe fn from_raw(raw: *mut raw::LIBSSH2_SESSION) -> Session {
Session {
raw: raw,
- marker: marker::NoSync,
}
}