Skip to content

Rollup of 7 pull requests #100985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 19 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f847388
Implementation of import_name_type
dpaoliello Jul 12, 2022
69715c9
sugg: suggest the usage of boolean value when there is a typo in the …
vincenzopalazzo Aug 20, 2022
2a8fd51
Make `const_eval_select` a real intrinsic
fee1-dead Aug 23, 2022
cb4cd73
extra sanity check against consts pointing to mutable memory
RalfJung Aug 23, 2022
289d7cc
Reduce code size of `assert_matches_failed`
a1phyr Aug 23, 2022
7119395
translations(rustc_session): migrate the file cgu_reuse_tracker
beowolx Aug 19, 2022
77b01ac
translations(rustc_session): migrate 80% of the file parse.rs
beowolx Aug 22, 2022
36c42fa
Use `DisplayBuffer` for socket addresses.
reitermarkus Aug 16, 2022
63700a8
Add tests for `SockAddr` `Display`.
reitermarkus Aug 19, 2022
89c74e8
Move `net::parser` into `net::addr` module.
reitermarkus Aug 19, 2022
d61ecec
Flatten `net` module again.
reitermarkus Aug 24, 2022
d90f2a0
translations(rustc_session): migrate check_expected_reuse
beowolx Aug 24, 2022
ddab42d
Rollup merge of #100640 - reitermarkus:socket-display-buffer, r=thomcc
Dylan-DPC Aug 25, 2022
7269090
Rollup merge of #100732 - dpaoliello:import_name_type, r=wesleywiser
Dylan-DPC Aug 25, 2022
7786b38
Rollup merge of #100753 - LuisCardosoOliveira:translation-migrate-ses…
Dylan-DPC Aug 25, 2022
6ba924a
Rollup merge of #100759 - fee1-dead-contrib:const_eval_select_real_in…
Dylan-DPC Aug 25, 2022
5219ff6
Rollup merge of #100817 - vincenzopalazzo:macros/bool_spelling_sugg, …
Dylan-DPC Aug 25, 2022
c50ee94
Rollup merge of #100897 - RalfJung:const-not-to-mutable, r=lcnr
Dylan-DPC Aug 25, 2022
d7fbdc2
Rollup merge of #100933 - a1phyr:cheap_assert_match_failed, r=JoshTri…
Dylan-DPC Aug 25, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move net::parser into net::addr module.
  • Loading branch information
reitermarkus committed Aug 24, 2022
commit 89c74e8e25216d9e18d515cf4792b0f2ee92226c
1 change: 1 addition & 0 deletions library/std/src/net/addr/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
mod display_buffer;

pub mod ip;
pub mod parser;
pub mod socket;
File renamed without changes.
5 changes: 2 additions & 3 deletions library/std/src/net/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ use crate::io::{self, ErrorKind};
#[stable(feature = "rust1", since = "1.0.0")]
pub use self::addr::ip::{IpAddr, Ipv4Addr, Ipv6Addr, Ipv6MulticastScope};
#[stable(feature = "rust1", since = "1.0.0")]
pub use self::addr::socket::{SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
pub use self::addr::parser::AddrParseError;
#[stable(feature = "rust1", since = "1.0.0")]
pub use self::parser::AddrParseError;
pub use self::addr::socket::{SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
#[unstable(feature = "tcplistener_into_incoming", issue = "88339")]
pub use self::tcp::IntoIncoming;
#[stable(feature = "rust1", since = "1.0.0")]
Expand All @@ -37,7 +37,6 @@ pub use self::tcp::{Incoming, TcpListener, TcpStream};
pub use self::udp::UdpSocket;

mod addr;
mod parser;
mod tcp;
#[cfg(test)]
mod test;
Expand Down