aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-11-05 10:13:21 -0700
committerSteven Fackler <[email protected]>2016-11-05 10:15:40 -0700
commit99b41a005041018484284d3c85bf2474f90d7d8a (patch)
treead4df1ef2d1d3b3c1676ba1518467f8a3a1f4258 /openssl/src/ssl
parentFix systest (diff)
downloadrust-openssl-99b41a005041018484284d3c85bf2474f90d7d8a.tar.xz
rust-openssl-99b41a005041018484284d3c85bf2474f90d7d8a.zip
Rename accessors
Diffstat (limited to 'openssl/src/ssl')
-rw-r--r--openssl/src/ssl/connector.rs8
-rw-r--r--openssl/src/ssl/tests/mod.rs4
2 files changed, 6 insertions, 6 deletions
diff --git a/openssl/src/ssl/connector.rs b/openssl/src/ssl/connector.rs
index 52d26ef5..4bebecd8 100644
--- a/openssl/src/ssl/connector.rs
+++ b/openssl/src/ssl/connector.rs
@@ -66,12 +66,12 @@ impl SslConnectorBuilder {
}
/// Returns a shared reference to the inner `SslContextBuilder`.
- pub fn context(&self) -> &SslContextBuilder {
+ pub fn builder(&self) -> &SslContextBuilder {
&self.0
}
/// Returns a mutable reference to the inner `SslContextBuilder`.
- pub fn context_mut(&mut self) -> &mut SslContextBuilder {
+ pub fn builder_mut(&mut self) -> &mut SslContextBuilder {
&mut self.0
}
@@ -187,12 +187,12 @@ impl SslAcceptorBuilder {
}
/// Returns a shared reference to the inner `SslContextBuilder`.
- pub fn context(&self) -> &SslContextBuilder {
+ pub fn builder(&self) -> &SslContextBuilder {
&self.0
}
/// Returns a mutable reference to the inner `SslContextBuilder`.
- pub fn context_mut(&mut self) -> &mut SslContextBuilder {
+ pub fn builder_mut(&mut self) -> &mut SslContextBuilder {
&mut self.0
}
diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs
index df02c778..a84f6b25 100644
--- a/openssl/src/ssl/tests/mod.rs
+++ b/openssl/src/ssl/tests/mod.rs
@@ -1107,7 +1107,7 @@ fn connector_client_server_mozilla_intermediate() {
});
let mut connector = SslConnectorBuilder::new(SslMethod::tls()).unwrap();
- connector.context_mut().set_ca_file("test/root-ca.pem").unwrap();
+ connector.builder_mut().set_ca_file("test/root-ca.pem").unwrap();
let connector = connector.build();
let stream = TcpStream::connect(("127.0.0.1", port)).unwrap();
@@ -1139,7 +1139,7 @@ fn connector_client_server_mozilla_modern() {
});
let mut connector = SslConnectorBuilder::new(SslMethod::tls()).unwrap();
- connector.context_mut().set_ca_file("test/root-ca.pem").unwrap();
+ connector.builder_mut().set_ca_file("test/root-ca.pem").unwrap();
let connector = connector.build();
let stream = TcpStream::connect(("127.0.0.1", port)).unwrap();