about summary refs log tree commit diff
path: root/src/liballoc_system
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-01-07 09:00:52 +0000
committerbors <bors@rust-lang.org>2017-01-07 09:00:52 +0000
commitb9637f79e261d0b90d23bdbce6b0a16d42868bdd (patch)
treeb60e9e0b3e811a6b5989819458c65fb0b090131b /src/liballoc_system
parent008e2393bddcf286393e2c14ad1312f566536bf0 (diff)
parent2d365c6b7ae0ed76d85e6dccaccc5782728e5d0b (diff)
downloadrust-b9637f79e261d0b90d23bdbce6b0a16d42868bdd.tar.gz
rust-b9637f79e261d0b90d23bdbce6b0a16d42868bdd.zip
Auto merge of #38327 - Yamakaky:into-ipaddr, r=brson
Impl From<Ipv4Addr, Ipv6Addr> for IpAddr.

Fixes https://github.com/rust-lang/rfcs/issues/1816.
Diffstat (limited to 'src/liballoc_system')
0 files changed, 0 insertions, 0 deletions