Merge pull request #134 from jonhoo/relax-ref-bounds

Relax bounds for get_ref and get_mut

Author: sfackler

.circleci/config.yml

@@ -63,6 +63,6 @@ workflows:
     jobs:
       - linux:
           name: openssl
-          image: 1.30.0-stretch
+          image: 1.32.0-stretch
       - macos:
-          version: 1.30.0
+          version: 1.32.0

Cargo.toml

@@ -18,7 +18,7 @@ libc = "0.2"
 tempfile = "3.0"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-schannel = "0.1.13"
+schannel = "0.1.16"
 
 [target.'cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))'.dependencies]
 log = "0.4.5"

appveyor.yml

@@ -1,5 +1,5 @@
 environment:
-  RUST_VERSION: 1.30.0
+  RUST_VERSION: 1.32.0
   TARGET: x86_64-pc-windows-msvc
 install:
   - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:RUST_VERSION}-${env:TARGET}.exe"

src/imp/openssl.rs

@@ -332,15 +332,17 @@ impl<S: fmt::Debug> fmt::Debug for TlsStream<S> {
     }
 }
 
-impl<S: io::Read + io::Write> TlsStream<S> {
+impl<S> TlsStream<S> {
     pub fn get_ref(&self) -> &S {
         self.0.get_ref()
     }
 
     pub fn get_mut(&mut self) -> &mut S {
         self.0.get_mut()
     }
+}
 
+impl<S: io::Read + io::Write> TlsStream<S> {
     pub fn buffered_read_size(&self) -> Result<usize, Error> {
         Ok(self.0.ssl().pending())
     }

src/imp/schannel.rs

@@ -135,18 +135,20 @@ where
     }
 }
 
-impl<S> MidHandshakeTlsStream<S>
-where
-    S: io::Read + io::Write,
-{
+impl<S> MidHandshakeTlsStream<S> {
     pub fn get_ref(&self) -> &S {
         self.0.get_ref()
     }
 
     pub fn get_mut(&mut self) -> &mut S {
         self.0.get_mut()
     }
+}
 
+impl<S> MidHandshakeTlsStream<S>
+where
+    S: io::Read + io::Write,
+{
     pub fn handshake(self) -> Result<TlsStream<S>, HandshakeError<S>> {
         match self.0.handshake() {
             Ok(s) => Ok(TlsStream(s)),
@@ -273,15 +275,17 @@ impl<S: fmt::Debug> fmt::Debug for TlsStream<S> {
     }
 }
 
-impl<S: io::Read + io::Write> TlsStream<S> {
+impl<S> TlsStream<S> {
     pub fn get_ref(&self) -> &S {
         self.0.get_ref()
     }
 
     pub fn get_mut(&mut self) -> &mut S {
         self.0.get_mut()
     }
+}
 
+impl<S: io::Read + io::Write> TlsStream<S> {
     pub fn buffered_read_size(&self) -> Result<usize, Error> {
         Ok(self.0.get_buf().len())
     }

src/imp/security_framework.rs

@@ -218,10 +218,7 @@ where
     }
 }
 
-impl<S> MidHandshakeTlsStream<S>
-where
-    S: io::Read + io::Write,
-{
+impl<S> MidHandshakeTlsStream<S> {
     pub fn get_ref(&self) -> &S {
         match *self {
             MidHandshakeTlsStream::Server(ref s, _) => s.get_ref(),
@@ -235,7 +232,12 @@ where
             MidHandshakeTlsStream::Client(ref mut s) => s.get_mut(),
         }
     }
+}
 
+impl<S> MidHandshakeTlsStream<S>
+where
+    S: io::Read + io::Write,
+{
     pub fn handshake(self) -> Result<TlsStream<S>, HandshakeError<S>> {
         match self {
             MidHandshakeTlsStream::Server(s, cert) => match s.handshake() {
@@ -362,15 +364,17 @@ impl<S: fmt::Debug> fmt::Debug for TlsStream<S> {
     }
 }
 
-impl<S: io::Read + io::Write> TlsStream<S> {
+impl<S> TlsStream<S> {
     pub fn get_ref(&self) -> &S {
         self.stream.get_ref()
     }
 
     pub fn get_mut(&mut self) -> &mut S {
         self.stream.get_mut()
     }
+}
 
+impl<S: io::Read + io::Write> TlsStream<S> {
     pub fn buffered_read_size(&self) -> Result<usize, Error> {
         Ok(self.stream.context().buffered_read_size()?)
     }

src/lib.rs

@@ -220,10 +220,7 @@ where
     }
 }
 
-impl<S> MidHandshakeTlsStream<S>
-where
-    S: io::Read + io::Write,
-{
+impl<S> MidHandshakeTlsStream<S> {
     /// Returns a shared reference to the inner stream.
     pub fn get_ref(&self) -> &S {
         self.0.get_ref()
@@ -233,7 +230,12 @@ where
     pub fn get_mut(&mut self) -> &mut S {
         self.0.get_mut()
     }
+}
 
+impl<S> MidHandshakeTlsStream<S>
+where
+    S: io::Read + io::Write,
+{
     /// Restarts the handshake process.
     ///
     /// If the handshake completes successfully then the negotiated stream is
@@ -608,7 +610,7 @@ impl<S: fmt::Debug> fmt::Debug for TlsStream<S> {
     }
 }
 
-impl<S: io::Read + io::Write> TlsStream<S> {
+impl<S> TlsStream<S> {
     /// Returns a shared reference to the inner stream.
     pub fn get_ref(&self) -> &S {
         self.0.get_ref()
@@ -618,7 +620,9 @@ impl<S: io::Read + io::Write> TlsStream<S> {
     pub fn get_mut(&mut self) -> &mut S {
         self.0.get_mut()
     }
+}
 
+impl<S: io::Read + io::Write> TlsStream<S> {
     /// Returns the number of bytes that can be read without resulting in any
     /// network calls.
     pub fn buffered_read_size(&self) -> Result<usize> {