Make delegation methods of `std::net::IpAddr` unstably const by CDirkx · Pull Request #76304 · rust-lang/rust

CDirkx · 2020-09-03T23:40:08Z

Make the following methods of std::net::IpAddr unstable const under the const_ip feature:

is_unspecified
is_loopback
is_global
is_multicast

Also adds a test for these methods in a const context.

Possible because these methods delegate to the inner Ipv4Addr or Ipv6Addr, which were made const (PR#76205 and PR#76206), and the recent stabilization of const control flow.

Part of #76205

r? @ecstatic-morse

ecstatic-morse · 2020-09-04T17:09:53Z

LGTM! Any reason not to do is_ipv{4,6} as part of this PR as well?

@bors delegate+

bors · 2020-09-04T17:09:55Z

✌️ @CDirkx can now approve this pull request

CDirkx · 2020-09-04T17:18:55Z

I had already opened up PR#76226 to directly stabilize those as const, although I could include them here as unstable const, and when this gets merged rebase the stabilization PR.

ecstatic-morse · 2020-09-04T17:22:55Z

No need.

@bors r+ rollup

bors · 2020-09-04T17:22:57Z

📌 Commit 0c339b5bf283bfc839c06018190b2ab849be9270 has been approved by ecstatic-morse

@ghost

Rollup of 18 pull requests Successful merges: - rust-lang#76273 (Move some Vec UI tests into alloc unit tests) - rust-lang#76274 (Allow try blocks as the argument to return expressions) - rust-lang#76287 (Remove an unnecessary allowed lint) - rust-lang#76293 (Implementation of incompatible features error) - rust-lang#76299 (Make `Ipv4Addr` and `Ipv6Addr` const tests unit tests under `library`) - rust-lang#76302 (Address review comments on `Peekable::next_if`) - rust-lang#76303 (Link to `#capacity-and-reallocation` when using with_capacity) - rust-lang#76305 (Move various ui const tests to `library`) - rust-lang#76309 (Indent a note to make folding work nicer) - rust-lang#76312 (time.rs: Make spelling of "Darwin" consistent) - rust-lang#76318 (Use ops::ControlFlow in rustc_data_structures::graph::iterate) - rust-lang#76324 (Move Vec slice UI tests in library) - rust-lang#76338 (add some intra-doc links to `Iterator`) - rust-lang#76340 (Remove unused duplicated `trivial_dropck_outlives`) - rust-lang#76344 (Improve docs for `std::env::args()`) - rust-lang#76346 (Docs: nlink example typo) - rust-lang#76358 (Minor grammar fix in doc comment for soft-deprecated methods) - rust-lang#76364 (Disable atomics on avr target.) Failed merges: - rust-lang#76304 (Make delegation methods of `std::net::IpAddr` unstably const) r? @ghost

bors · 2020-09-07T02:48:41Z

☔ The latest upstream changes (presumably #76422) made this pull request unmergeable. Please resolve the merge conflicts.

CDirkx · 2020-09-07T16:32:25Z

Rebased onto master.

CDirkx · 2020-09-08T23:17:17Z

@bors retry

bors · 2020-09-23T08:39:29Z

☔ The latest upstream changes (presumably #76850) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

ecstatic-morse · 2020-09-23T16:05:54Z

Huh, this seems to have never gotten added to the queue. bors retry can sometimes be finicky. Sorry @CDirkx. I'll make sure it gets in after a rebase.

Make the following methods of `std::net::IpAddr` unstable const under the `const_ip` feature: - `is_unspecified` - `is_loopback` - `is_global` - `is_multicast` Also adds a test for these methods in a const context. Possible because these methods delegate to the inner `Ipv4Addr` or `Ipv6Addr`, which were made const, and the recent stabilization of const control flow. Part of rust-lang#76205

CDirkx · 2020-09-23T19:50:18Z

Ah, I thought I used the wrong command. Rebased, so @bors retry

ecstatic-morse · 2020-09-23T19:52:41Z

@bors r+

bors · 2020-09-23T19:52:42Z

📌 Commit 947536f has been approved by ecstatic-morse

ecstatic-morse · 2020-09-23T19:54:23Z

(I would use r={reviewer} when delegated to, retry seems to fail sometimes)

@ecstatic-morse

Make delegation methods of `std::net::IpAddr` unstably const Make the following methods of `std::net::IpAddr` unstable const under the `const_ip` feature: - `is_unspecified` - `is_loopback` - `is_global` - `is_multicast` Also adds a test for these methods in a const context. Possible because these methods delegate to the inner `Ipv4Addr` or `Ipv6Addr`, which were made const ([PR#76205](rust-lang#76142) and [PR#76206](rust-lang#76206)), and the recent stabilization of const control flow. Part of rust-lang#76205 r? @ecstatic-morse

…as-schievink Rollup of 15 pull requests Successful merges: - rust-lang#75438 (Use adaptive SVG favicon for rustdoc like other rust sites) - rust-lang#76304 (Make delegation methods of `std::net::IpAddr` unstably const) - rust-lang#76724 (Allow a unique name to be assigned to dataflow graphviz output) - rust-lang#76978 (Documented From impls in std/sync/mpsc/mod.rs) - rust-lang#77044 (Liballoc bench vec use mem take not replace) - rust-lang#77050 (Typo fix: "satsify" -> "satisfy") - rust-lang#77074 (add array::from_ref) - rust-lang#77078 (Don't use an if guard to check equality with a constant) - rust-lang#77079 (Use `Self` in docs when possible) - rust-lang#77081 (Merge two almost identical match arms) - rust-lang#77121 (Updated html_root_url for compiler crates) - rust-lang#77136 (Suggest `const_mut_refs`, not `const_fn` for mutable references in `const fn`) - rust-lang#77160 (Suggest `const_fn_transmute`, not `const_fn`) - rust-lang#77164 (Remove workaround for deref issue that no longer exists.) - rust-lang#77165 (Followup to rust-lang#76673) Failed merges: r? `@ghost`

rust-highfive assigned ecstatic-morse Sep 3, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 3, 2020

CDirkx mentioned this pull request Sep 3, 2020
Constify std::net::IpAddr, Ipv4Addr, and Ipv6Addr#76205
Closed

jyn514 added A-const-fn T-libs-api [DEPRECATED; DO NOT USE] labels Sep 4, 2020

jyn514 changed the title ~~Make delegation methods of std::net::IpAddr const~~Make delegation methods of std::net::IpAddr unstably constSep 4, 2020

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 4, 2020

This was referenced Sep 6, 2020
Rollup of 18 pull requests #76414
Closed
Rollup of 18 pull requests #76422
Merged

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 7, 2020

CDirkx force-pushed the const-ip branch 2 times, most recently from ba84081 to ac28f1fCompare September 7, 2020 15:44

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 8, 2020

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 23, 2020

CDirkx force-pushed the const-ip branch from ac28f1f to 947536fCompare September 23, 2020 19:47

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 23, 2020

Dylan-DPC-zz mentioned this pull request Sep 24, 2020
Rollup of 12 pull requests #77132
Closed

jonas-schievink mentioned this pull request Sep 25, 2020
Rollup of 15 pull requests #77172
Merged

bors merged commit 88e3693 into rust-lang:masterSep 25, 2020

rustbot added this to the 1.48.0 milestone Sep 25, 2020

CDirkx deleted the const-ip branch October 17, 2020 13:41

RalfJung added the A-const-eval Area: Constant evaluation, covers all const contexts (static, const fn, ...) label Dec 1, 2024

Uh oh!

Uh oh!

Conversation

CDirkx commented Sep 3, 2020

Uh oh!

ecstatic-morse commented Sep 4, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

CDirkx commented Sep 4, 2020

Uh oh!

ecstatic-morse commented Sep 4, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

bors commented Sep 7, 2020

Uh oh!

CDirkx commented Sep 7, 2020

Uh oh!

CDirkx commented Sep 8, 2020

Uh oh!

bors commented Sep 23, 2020

Uh oh!

ecstatic-morse commented Sep 23, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CDirkx commented Sep 23, 2020

Uh oh!

ecstatic-morse commented Sep 23, 2020

Uh oh!

bors commented Sep 23, 2020

Uh oh!

ecstatic-morse commented Sep 23, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

ecstatic-morse commented Sep 23, 2020•
edited
Loading