Update to rust master

2 files changed, 140 insertions, 140 deletions

diff --git a/libssh2-sys/lib.rs b/libssh2-sys/lib.rs
index 75b2aa8..76059d5 100644
--- a/libssh2-sys/lib.rs
+++ b/libssh2-sys/lib.rs
@@ -8,138 +8,138 @@ extern crate "link-config" as link_conifg;
 use libc::{c_int, size_t, c_void, c_char, c_long, c_uchar, c_uint, c_ulong};
 use libc::ssize_t;
 
-pub static SSH_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT: c_int = 1;
-pub static SSH_DISCONNECT_PROTOCOL_ERROR: c_int = 2;
-pub static SSH_DISCONNECT_KEY_EXCHANGE_FAILED: c_int = 3;
-pub static SSH_DISCONNECT_RESERVED: c_int = 4;
-pub static SSH_DISCONNECT_MAC_ERROR: c_int = 5;
-pub static SSH_DISCONNECT_COMPRESSION_ERROR: c_int = 6;
-pub static SSH_DISCONNECT_SERVICE_NOT_AVAILABLE: c_int = 7;
-pub static SSH_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED: c_int = 8;
-pub static SSH_DISCONNECT_HOST_KEY_NOT_VERIFIABLE: c_int = 9;
-pub static SSH_DISCONNECT_CONNECTION_LOST: c_int = 10;
-pub static SSH_DISCONNECT_BY_APPLICATION: c_int = 11;
-pub static SSH_DISCONNECT_TOO_MANY_CONNECTIONS: c_int = 12;
-pub static SSH_DISCONNECT_AUTH_CANCELLED_BY_USER: c_int = 13;
-pub static SSH_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE: c_int = 14;
-pub static SSH_DISCONNECT_ILLEGAL_USER_NAME: c_int = 15;
-
-pub static LIBSSH2_FLAG_SIGPIPE: c_int = 1;
-pub static LIBSSH2_FLAG_COMPRESS: c_int = 2;
-
-pub static LIBSSH2_HOSTKEY_TYPE_UNKNOWN: c_int = 0;
-pub static LIBSSH2_HOSTKEY_TYPE_RSA: c_int = 1;
-pub static LIBSSH2_HOSTKEY_TYPE_DSS: c_int = 2;
-
-pub static LIBSSH2_METHOD_KEX: c_int = 0;
-pub static LIBSSH2_METHOD_HOSTKEY: c_int = 1;
-pub static LIBSSH2_METHOD_CRYPT_CS: c_int = 2;
-pub static LIBSSH2_METHOD_CRYPT_SC: c_int = 3;
-pub static LIBSSH2_METHOD_MAC_CS: c_int = 4;
-pub static LIBSSH2_METHOD_MAC_SC: c_int = 5;
-pub static LIBSSH2_METHOD_COMP_CS: c_int = 6;
-pub static LIBSSH2_METHOD_COMP_SC: c_int = 7;
-pub static LIBSSH2_METHOD_LANG_CS: c_int = 8;
-pub static LIBSSH2_METHOD_LANG_SC: c_int = 9;
-
-pub static LIBSSH2_CHANNEL_PACKET_DEFAULT: c_uint = 32768;
-pub static LIBSSH2_CHANNEL_WINDOW_DEFAULT: c_uint = 2 * 1024 * 1024;
-
-pub static LIBSSH2_ERROR_BANNER_RECV: c_int = -2;
-pub static LIBSSH2_ERROR_BANNER_SEND: c_int = -3;
-pub static LIBSSH2_ERROR_INVALID_MAC: c_int = -4;
-pub static LIBSSH2_ERROR_KEX_FAILURE: c_int = -5;
-pub static LIBSSH2_ERROR_ALLOC: c_int = -6;
-pub static LIBSSH2_ERROR_SOCKET_SEND: c_int = -7;
-pub static LIBSSH2_ERROR_KEY_EXCHANGE_FAILURE: c_int = -8;
-pub static LIBSSH2_ERROR_TIMEOUT: c_int = -9;
-pub static LIBSSH2_ERROR_HOSTKEY_INIT: c_int = -10;
-pub static LIBSSH2_ERROR_HOSTKEY_SIGN: c_int = -11;
-pub static LIBSSH2_ERROR_DECRYPT: c_int = -12;
-pub static LIBSSH2_ERROR_SOCKET_DISCONNECT: c_int = -13;
-pub static LIBSSH2_ERROR_PROTO: c_int = -14;
-pub static LIBSSH2_ERROR_PASSWORD_EXPIRED: c_int = -15;
-pub static LIBSSH2_ERROR_FILE: c_int = -16;
-pub static LIBSSH2_ERROR_METHOD_NONE: c_int = -17;
-pub static LIBSSH2_ERROR_AUTHENTICATION_FAILED: c_int = -18;
-pub static LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED: c_int =
+pub const SSH_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT: c_int = 1;
+pub const SSH_DISCONNECT_PROTOCOL_ERROR: c_int = 2;
+pub const SSH_DISCONNECT_KEY_EXCHANGE_FAILED: c_int = 3;
+pub const SSH_DISCONNECT_RESERVED: c_int = 4;
+pub const SSH_DISCONNECT_MAC_ERROR: c_int = 5;
+pub const SSH_DISCONNECT_COMPRESSION_ERROR: c_int = 6;
+pub const SSH_DISCONNECT_SERVICE_NOT_AVAILABLE: c_int = 7;
+pub const SSH_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED: c_int = 8;
+pub const SSH_DISCONNECT_HOST_KEY_NOT_VERIFIABLE: c_int = 9;
+pub const SSH_DISCONNECT_CONNECTION_LOST: c_int = 10;
+pub const SSH_DISCONNECT_BY_APPLICATION: c_int = 11;
+pub const SSH_DISCONNECT_TOO_MANY_CONNECTIONS: c_int = 12;
+pub const SSH_DISCONNECT_AUTH_CANCELLED_BY_USER: c_int = 13;
+pub const SSH_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE: c_int = 14;
+pub const SSH_DISCONNECT_ILLEGAL_USER_NAME: c_int = 15;
+
+pub const LIBSSH2_FLAG_SIGPIPE: c_int = 1;
+pub const LIBSSH2_FLAG_COMPRESS: c_int = 2;
+
+pub const LIBSSH2_HOSTKEY_TYPE_UNKNOWN: c_int = 0;
+pub const LIBSSH2_HOSTKEY_TYPE_RSA: c_int = 1;
+pub const LIBSSH2_HOSTKEY_TYPE_DSS: c_int = 2;
+
+pub const LIBSSH2_METHOD_KEX: c_int = 0;
+pub const LIBSSH2_METHOD_HOSTKEY: c_int = 1;
+pub const LIBSSH2_METHOD_CRYPT_CS: c_int = 2;
+pub const LIBSSH2_METHOD_CRYPT_SC: c_int = 3;
+pub const LIBSSH2_METHOD_MAC_CS: c_int = 4;
+pub const LIBSSH2_METHOD_MAC_SC: c_int = 5;
+pub const LIBSSH2_METHOD_COMP_CS: c_int = 6;
+pub const LIBSSH2_METHOD_COMP_SC: c_int = 7;
+pub const LIBSSH2_METHOD_LANG_CS: c_int = 8;
+pub const LIBSSH2_METHOD_LANG_SC: c_int = 9;
+
+pub const LIBSSH2_CHANNEL_PACKET_DEFAULT: c_uint = 32768;
+pub const LIBSSH2_CHANNEL_WINDOW_DEFAULT: c_uint = 2 * 1024 * 1024;
+
+pub const LIBSSH2_ERROR_BANNER_RECV: c_int = -2;
+pub const LIBSSH2_ERROR_BANNER_SEND: c_int = -3;
+pub const LIBSSH2_ERROR_INVALID_MAC: c_int = -4;
+pub const LIBSSH2_ERROR_KEX_FAILURE: c_int = -5;
+pub const LIBSSH2_ERROR_ALLOC: c_int = -6;
+pub const LIBSSH2_ERROR_SOCKET_SEND: c_int = -7;
+pub const LIBSSH2_ERROR_KEY_EXCHANGE_FAILURE: c_int = -8;
+pub const LIBSSH2_ERROR_TIMEOUT: c_int = -9;
+pub const LIBSSH2_ERROR_HOSTKEY_INIT: c_int = -10;
+pub const LIBSSH2_ERROR_HOSTKEY_SIGN: c_int = -11;
+pub const LIBSSH2_ERROR_DECRYPT: c_int = -12;
+pub const LIBSSH2_ERROR_SOCKET_DISCONNECT: c_int = -13;
+pub const LIBSSH2_ERROR_PROTO: c_int = -14;
+pub const LIBSSH2_ERROR_PASSWORD_EXPIRED: c_int = -15;
+pub const LIBSSH2_ERROR_FILE: c_int = -16;
+pub const LIBSSH2_ERROR_METHOD_NONE: c_int = -17;
+pub const LIBSSH2_ERROR_AUTHENTICATION_FAILED: c_int = -18;
+pub const LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED: c_int =
                 LIBSSH2_ERROR_AUTHENTICATION_FAILED;
-pub static LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED: c_int = -19;
-pub static LIBSSH2_ERROR_CHANNEL_OUTOFORDER: c_int = -20;
-pub static LIBSSH2_ERROR_CHANNEL_FAILURE: c_int = -21;
-pub static LIBSSH2_ERROR_CHANNEL_REQUEST_DENIED: c_int = -22;
-pub static LIBSSH2_ERROR_CHANNEL_UNKNOWN: c_int = -23;
-pub static LIBSSH2_ERROR_CHANNEL_WINDOW_EXCEEDED: c_int = -24;
-pub static LIBSSH2_ERROR_CHANNEL_PACKET_EXCEEDED: c_int = -25;
-pub static LIBSSH2_ERROR_CHANNEL_CLOSED: c_int = -26;
-pub static LIBSSH2_ERROR_CHANNEL_EOF_SENT: c_int = -27;
-pub static LIBSSH2_ERROR_SCP_PROTOCOL: c_int = -28;
-pub static LIBSSH2_ERROR_ZLIB: c_int = -29;
-pub static LIBSSH2_ERROR_SOCKET_TIMEOUT: c_int = -30;
-pub static LIBSSH2_ERROR_SFTP_PROTOCOL: c_int = -31;
-pub static LIBSSH2_ERROR_REQUEST_DENIED: c_int = -32;
-pub static LIBSSH2_ERROR_METHOD_NOT_SUPPORTED: c_int = -33;
-pub static LIBSSH2_ERROR_INVAL: c_int = -34;
-pub static LIBSSH2_ERROR_INVALID_POLL_TYPE: c_int = -35;
-pub static LIBSSH2_ERROR_PUBLICKEY_PROTOCOL: c_int = -36;
-pub static LIBSSH2_ERROR_EAGAIN: c_int = -37;
-pub static LIBSSH2_ERROR_BUFFER_TOO_SMALL: c_int = -38;
-pub static LIBSSH2_ERROR_BAD_USE: c_int = -39;
-pub static LIBSSH2_ERROR_COMPRESS: c_int = -40;
-pub static LIBSSH2_ERROR_OUT_OF_BOUNDARY: c_int = -41;
-pub static LIBSSH2_ERROR_AGENT_PROTOCOL: c_int = -42;
-pub static LIBSSH2_ERROR_SOCKET_RECV: c_int = -43;
-pub static LIBSSH2_ERROR_ENCRYPT: c_int = -44;
-pub static LIBSSH2_ERROR_BAD_SOCKET: c_int = -45;
-pub static LIBSSH2_ERROR_KNOWN_HOSTS: c_int = -46;
-
-pub static LIBSSH2_HOSTKEY_HASH_MD5: c_int = 1;
-pub static LIBSSH2_HOSTKEY_HASH_SHA1: c_int = 2;
-
-pub static LIBSSH2_KNOWNHOST_FILE_OPENSSH: c_int = 1;
-
-pub static LIBSSH2_KNOWNHOST_CHECK_MATCH: c_int = 0;
-pub static LIBSSH2_KNOWNHOST_CHECK_MISMATCH: c_int = 1;
-pub static LIBSSH2_KNOWNHOST_CHECK_NOTFOUND: c_int = 2;
-pub static LIBSSH2_KNOWNHOST_CHECK_FAILURE: c_int = 3;
-
-pub static LIBSSH2_KNOWNHOST_TYPE_PLAIN: c_int = 1;
-pub static LIBSSH2_KNOWNHOST_TYPE_SHA1: c_int = 2;
-pub static LIBSSH2_KNOWNHOST_TYPE_CUSTOM: c_int = 3;
-pub static LIBSSH2_KNOWNHOST_KEYENC_RAW: c_int = 1 << 16;
-pub static LIBSSH2_KNOWNHOST_KEYENC_BASE64: c_int = 2 << 16;
-pub static LIBSSH2_KNOWNHOST_KEY_RSA1: c_int = 1 << 18;
-pub static LIBSSH2_KNOWNHOST_KEY_SSHRSA: c_int = 2 << 18;
-pub static LIBSSH2_KNOWNHOST_KEY_SSHDSS: c_int = 3 << 18;
-pub static LIBSSH2_KNOWNHOST_KEY_UNKNOWN: c_int = 7 << 18;
-
-pub static LIBSSH2_FXF_READ: c_ulong = 0x00000001;
-pub static LIBSSH2_FXF_WRITE: c_ulong = 0x00000002;
-pub static LIBSSH2_FXF_APPEND: c_ulong = 0x00000004;
-pub static LIBSSH2_FXF_CREAT: c_ulong = 0x00000008;
-pub static LIBSSH2_FXF_TRUNC: c_ulong = 0x00000010;
-pub static LIBSSH2_FXF_EXCL: c_ulong = 0x00000020;
-
-pub static LIBSSH2_SFTP_OPENFILE: c_int = 0;
-pub static LIBSSH2_SFTP_OPENDIR: c_int = 1;
-
-pub static LIBSSH2_SFTP_ATTR_SIZE: c_ulong = 0x00000001;
-pub static LIBSSH2_SFTP_ATTR_UIDGID: c_ulong = 0x00000002;
-pub static LIBSSH2_SFTP_ATTR_PERMISSIONS: c_ulong = 0x00000004;
-pub static LIBSSH2_SFTP_ATTR_ACMODTIME: c_ulong = 0x00000008;
-pub static LIBSSH2_SFTP_ATTR_EXTENDED: c_ulong = 0x80000000;
-
-pub static LIBSSH2_SFTP_STAT: c_int = 0;
-pub static LIBSSH2_SFTP_LSTAT: c_int = 1;
-pub static LIBSSH2_SFTP_SETSTAT: c_int = 2;
-
-pub static LIBSSH2_SFTP_SYMLINK: c_int = 0;
-pub static LIBSSH2_SFTP_READLINK: c_int = 1;
-pub static LIBSSH2_SFTP_REALPATH: c_int = 2;
-
-pub static LIBSSH2_SFTP_RENAME_OVERWRITE: c_long = 0x1;
-pub static LIBSSH2_SFTP_RENAME_ATOMIC: c_long = 0x2;
-pub static LIBSSH2_SFTP_RENAME_NATIVE: c_long = 0x4;
+pub const LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED: c_int = -19;
+pub const LIBSSH2_ERROR_CHANNEL_OUTOFORDER: c_int = -20;
+pub const LIBSSH2_ERROR_CHANNEL_FAILURE: c_int = -21;
+pub const LIBSSH2_ERROR_CHANNEL_REQUEST_DENIED: c_int = -22;
+pub const LIBSSH2_ERROR_CHANNEL_UNKNOWN: c_int = -23;
+pub const LIBSSH2_ERROR_CHANNEL_WINDOW_EXCEEDED: c_int = -24;
+pub const LIBSSH2_ERROR_CHANNEL_PACKET_EXCEEDED: c_int = -25;
+pub const LIBSSH2_ERROR_CHANNEL_CLOSED: c_int = -26;
+pub const LIBSSH2_ERROR_CHANNEL_EOF_SENT: c_int = -27;
+pub const LIBSSH2_ERROR_SCP_PROTOCOL: c_int = -28;
+pub const LIBSSH2_ERROR_ZLIB: c_int = -29;
+pub const LIBSSH2_ERROR_SOCKET_TIMEOUT: c_int = -30;
+pub const LIBSSH2_ERROR_SFTP_PROTOCOL: c_int = -31;
+pub const LIBSSH2_ERROR_REQUEST_DENIED: c_int = -32;
+pub const LIBSSH2_ERROR_METHOD_NOT_SUPPORTED: c_int = -33;
+pub const LIBSSH2_ERROR_INVAL: c_int = -34;
+pub const LIBSSH2_ERROR_INVALID_POLL_TYPE: c_int = -35;
+pub const LIBSSH2_ERROR_PUBLICKEY_PROTOCOL: c_int = -36;
+pub const LIBSSH2_ERROR_EAGAIN: c_int = -37;
+pub const LIBSSH2_ERROR_BUFFER_TOO_SMALL: c_int = -38;
+pub const LIBSSH2_ERROR_BAD_USE: c_int = -39;
+pub const LIBSSH2_ERROR_COMPRESS: c_int = -40;
+pub const LIBSSH2_ERROR_OUT_OF_BOUNDARY: c_int = -41;
+pub const LIBSSH2_ERROR_AGENT_PROTOCOL: c_int = -42;
+pub const LIBSSH2_ERROR_SOCKET_RECV: c_int = -43;
+pub const LIBSSH2_ERROR_ENCRYPT: c_int = -44;
+pub const LIBSSH2_ERROR_BAD_SOCKET: c_int = -45;
+pub const LIBSSH2_ERROR_KNOWN_HOSTS: c_int = -46;
+
+pub const LIBSSH2_HOSTKEY_HASH_MD5: c_int = 1;
+pub const LIBSSH2_HOSTKEY_HASH_SHA1: c_int = 2;
+
+pub const LIBSSH2_KNOWNHOST_FILE_OPENSSH: c_int = 1;
+
+pub const LIBSSH2_KNOWNHOST_CHECK_MATCH: c_int = 0;
+pub const LIBSSH2_KNOWNHOST_CHECK_MISMATCH: c_int = 1;
+pub const LIBSSH2_KNOWNHOST_CHECK_NOTFOUND: c_int = 2;
+pub const LIBSSH2_KNOWNHOST_CHECK_FAILURE: c_int = 3;
+
+pub const LIBSSH2_KNOWNHOST_TYPE_PLAIN: c_int = 1;
+pub const LIBSSH2_KNOWNHOST_TYPE_SHA1: c_int = 2;
+pub const LIBSSH2_KNOWNHOST_TYPE_CUSTOM: c_int = 3;
+pub const LIBSSH2_KNOWNHOST_KEYENC_RAW: c_int = 1 << 16;
+pub const LIBSSH2_KNOWNHOST_KEYENC_BASE64: c_int = 2 << 16;
+pub const LIBSSH2_KNOWNHOST_KEY_RSA1: c_int = 1 << 18;
+pub const LIBSSH2_KNOWNHOST_KEY_SSHRSA: c_int = 2 << 18;
+pub const LIBSSH2_KNOWNHOST_KEY_SSHDSS: c_int = 3 << 18;
+pub const LIBSSH2_KNOWNHOST_KEY_UNKNOWN: c_int = 7 << 18;
+
+pub const LIBSSH2_FXF_READ: c_ulong = 0x00000001;
+pub const LIBSSH2_FXF_WRITE: c_ulong = 0x00000002;
+pub const LIBSSH2_FXF_APPEND: c_ulong = 0x00000004;
+pub const LIBSSH2_FXF_CREAT: c_ulong = 0x00000008;
+pub const LIBSSH2_FXF_TRUNC: c_ulong = 0x00000010;
+pub const LIBSSH2_FXF_EXCL: c_ulong = 0x00000020;
+
+pub const LIBSSH2_SFTP_OPENFILE: c_int = 0;
+pub const LIBSSH2_SFTP_OPENDIR: c_int = 1;
+
+pub const LIBSSH2_SFTP_ATTR_SIZE: c_ulong = 0x00000001;
+pub const LIBSSH2_SFTP_ATTR_UIDGID: c_ulong = 0x00000002;
+pub const LIBSSH2_SFTP_ATTR_PERMISSIONS: c_ulong = 0x00000004;
+pub const LIBSSH2_SFTP_ATTR_ACMODTIME: c_ulong = 0x00000008;
+pub const LIBSSH2_SFTP_ATTR_EXTENDED: c_ulong = 0x80000000;
+
+pub const LIBSSH2_SFTP_STAT: c_int = 0;
+pub const LIBSSH2_SFTP_LSTAT: c_int = 1;
+pub const LIBSSH2_SFTP_SETSTAT: c_int = 2;
+
+pub const LIBSSH2_SFTP_SYMLINK: c_int = 0;
+pub const LIBSSH2_SFTP_READLINK: c_int = 1;
+pub const LIBSSH2_SFTP_REALPATH: c_int = 2;
+
+pub const LIBSSH2_SFTP_RENAME_OVERWRITE: c_long = 0x1;
+pub const LIBSSH2_SFTP_RENAME_ATOMIC: c_long = 0x2;
+pub const LIBSSH2_SFTP_RENAME_NATIVE: c_long = 0x4;
 
 pub enum LIBSSH2_SESSION {}
 pub enum LIBSSH2_AGENT {}
diff --git a/src/sftp.rs b/src/sftp.rs
index 77e8de2..779c4af 100644
--- a/src/sftp.rs
+++ b/src/sftp.rs
@@ -50,24 +50,24 @@ bitflags! {
     #[doc = "Options that can be used to configure how a file is opened"]
     flags OpenFlags: c_ulong {
         #[doc = "Open the file for reading."]
-        static READ = raw::LIBSSH2_FXF_READ,
+        const READ = raw::LIBSSH2_FXF_READ,
         #[doc = "Open the file for writing. If both this and Read are \
                  specified, the file is opened for both reading and writing"]
-        static WRITE = raw::LIBSSH2_FXF_WRITE,
+        const WRITE = raw::LIBSSH2_FXF_WRITE,
         #[doc = "Force all writes to append data at the end of the file."]
-        static APPEND = raw::LIBSSH2_FXF_APPEND,
+        const APPEND = raw::LIBSSH2_FXF_APPEND,
         #[doc = "If this flag is specified, then a new file will be created if \
                  one does not already exist (if Truncate is specified, the new \
                  file will be truncated to zero length if it previously \
                  exists) "]
-        static CREATE = raw::LIBSSH2_FXF_CREAT,
+        const CREATE = raw::LIBSSH2_FXF_CREAT,
         #[doc = "Forces an existing file with the same name to be truncated to \
                  zero length when creating a file by specifying `Create`. \
                  Using this flag implies the `Create` flag."]
-        static TRUNCATE = raw::LIBSSH2_FXF_TRUNC | CREATE.bits,
+        const TRUNCATE = raw::LIBSSH2_FXF_TRUNC | CREATE.bits,
         #[doc = "Causes the request to fail if the named file already exists. \
                  Using this flag implies the `Create` flag."]
-        static EXCLUSIVE = raw::LIBSSH2_FXF_EXCL | CREATE.bits
+        const EXCLUSIVE = raw::LIBSSH2_FXF_EXCL | CREATE.bits
     }
 }
 
@@ -77,13 +77,13 @@ bitflags! {
         #[doc = "In a rename operation, overwrite the destination if it \
                  already exists. If this flag is not present then it is an \
                  error if the destination already exists"]
-        static OVERWRITE = raw::LIBSSH2_SFTP_RENAME_OVERWRITE,
+        const OVERWRITE = raw::LIBSSH2_SFTP_RENAME_OVERWRITE,
         #[doc = "Inform the remote that an atomic rename operation is \
                  desired if available"]
-        static ATOMIC = raw::LIBSSH2_SFTP_RENAME_ATOMIC,
+        const ATOMIC = raw::LIBSSH2_SFTP_RENAME_ATOMIC,
         #[doc = "Inform the remote end that the native system calls for \
                  renaming should be used"]
-        static NATIVE = raw::LIBSSH2_SFTP_RENAME_NATIVE
+        const NATIVE = raw::LIBSSH2_SFTP_RENAME_NATIVE
     }
 }