Skip to content

Commit 0563577

Browse files
committed
---
yaml --- r: 278259 b: refs/heads/beta c: 2842d4d h: refs/heads/master i: 278257: 0a11f58 278255: 8bc02cc
1 parent dccf22e commit 0563577

File tree

4 files changed

+1
-65
lines changed

4 files changed

+1
-65
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 37a2869afa7eb0813becaf0070874806030052df
26+
refs/heads/beta: 2842d4d52da0ae2fe84fd24a0676f9491a01398a
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/libstd/net/tcp.rs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -221,29 +221,6 @@ impl TcpStream {
221221
self.0.ttl()
222222
}
223223

224-
/// Sets the value for the `IPV6_V6ONLY` option on this socket.
225-
///
226-
/// If this is set to `true` then the socket is restricted to sending and
227-
/// receiving IPv6 packets only. If this is the case, an IPv4 and an IPv6
228-
/// application can each bind the same port at the same time.
229-
///
230-
/// If this is set to `false` then the socket can be used to send and
231-
/// receive packets from an IPv4-mapped IPv6 address.
232-
#[stable(feature = "net2_mutators", since = "1.9.0")]
233-
pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
234-
self.0.set_only_v6(only_v6)
235-
}
236-
237-
/// Gets the value of the `IPV6_V6ONLY` option for this socket.
238-
///
239-
/// For more information about this option, see [`set_only_v6`][link].
240-
///
241-
/// [link]: #method.set_only_v6
242-
#[stable(feature = "net2_mutators", since = "1.9.0")]
243-
pub fn only_v6(&self) -> io::Result<bool> {
244-
self.0.only_v6()
245-
}
246-
247224
/// Get the value of the `SO_ERROR` option on this socket.
248225
///
249226
/// This will retrieve the stored error in the underlying socket, clearing

branches/beta/src/libstd/net/udp.rs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -243,29 +243,6 @@ impl UdpSocket {
243243
self.0.ttl()
244244
}
245245

246-
/// Sets the value for the `IPV6_V6ONLY` option on this socket.
247-
///
248-
/// If this is set to `true` then the socket is restricted to sending and
249-
/// receiving IPv6 packets only. If this is the case, an IPv4 and an IPv6
250-
/// application can each bind the same port at the same time.
251-
///
252-
/// If this is set to `false` then the socket can be used to send and
253-
/// receive packets from an IPv4-mapped IPv6 address.
254-
#[stable(feature = "net2_mutators", since = "1.9.0")]
255-
pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
256-
self.0.set_only_v6(only_v6)
257-
}
258-
259-
/// Gets the value of the `IPV6_V6ONLY` option for this socket.
260-
///
261-
/// For more information about this option, see [`set_only_v6`][link].
262-
///
263-
/// [link]: #method.set_only_v6
264-
#[stable(feature = "net2_mutators", since = "1.9.0")]
265-
pub fn only_v6(&self) -> io::Result<bool> {
266-
self.0.only_v6()
267-
}
268-
269246
/// Executes an operation of the `IP_ADD_MEMBERSHIP` type.
270247
///
271248
/// This function specifies a new multicast group for this socket to join.

branches/beta/src/libstd/sys/common/net.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -247,15 +247,6 @@ impl TcpStream {
247247
Ok(raw as u32)
248248
}
249249

250-
pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
251-
setsockopt(&self.inner, c::IPPROTO_IPV6, c::IPV6_V6ONLY, only_v6 as c_int)
252-
}
253-
254-
pub fn only_v6(&self) -> io::Result<bool> {
255-
let raw: c_int = getsockopt(&self.inner, c::IPPROTO_IPV6, c::IPV6_V6ONLY)?;
256-
Ok(raw != 0)
257-
}
258-
259250
pub fn take_error(&self) -> io::Result<Option<io::Error>> {
260251
self.inner.take_error()
261252
}
@@ -544,15 +535,6 @@ impl UdpSocket {
544535
Ok(raw as u32)
545536
}
546537

547-
pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> {
548-
setsockopt(&self.inner, c::IPPROTO_IPV6, c::IPV6_V6ONLY, only_v6 as c_int)
549-
}
550-
551-
pub fn only_v6(&self) -> io::Result<bool> {
552-
let raw: c_int = getsockopt(&self.inner, c::IPPROTO_IPV6, c::IPV6_V6ONLY)?;
553-
Ok(raw != 0)
554-
}
555-
556538
pub fn take_error(&self) -> io::Result<Option<io::Error>> {
557539
self.inner.take_error()
558540
}

0 commit comments

Comments
 (0)