about summary refs log tree commit diff
path: root/src/libstd/net/mod.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-02-27 12:22:13 +0000
committerbors <bors@rust-lang.org>2019-02-27 12:22:13 +0000
commit485537074062d6310178101b198606573527723c (patch)
treef27aa94208f3a3730fe821ffb5349f5d668d4d95 /src/libstd/net/mod.rs
parentf5b5f924eb9bfe7e28984fb3ae43f65ebe2bdaa2 (diff)
parent0f6b148db278dd14b11e009c60712f0303c05f79 (diff)
downloadrust-485537074062d6310178101b198606573527723c.tar.gz
rust-485537074062d6310178101b198606573527723c.zip
Auto merge of #58741 - varkor:lang-lib-feature-shared-name, r=alexreg
Allow lang and lib features to share names

Fixes https://github.com/rust-lang/rust/issues/58715.

I didn't add a test, because there's currently no standard lang test feature and I felt apprehensive about adding a permanently unstable feature. Instead, a shared lang/lib feature will be used in https://github.com/rust-lang/rust/pull/57760 and will essentially provide an immediately test.
Diffstat (limited to 'src/libstd/net/mod.rs')
0 files changed, 0 insertions, 0 deletions