Add missing examples for Ipv6Addr #37859

GuillaumeGomez · 2016-11-18T16:20:19Z

r? @steveklabnik

cc @frewsxcv

frewsxcv · 2016-11-18T16:44:36Z

@bors r+ rollup

frewsxcv · 2016-11-18T16:57:42Z

Travis error is unrelated.

ollie27 · 2016-11-18T17:43:08Z

src/libstd/net/ip.rs

+    /// use std::net::Ipv6Addr;
+    ///
+    /// assert_eq!(Ipv6Addr::new(65280, 0, 0, 0, 0, 0, 0, 0).octets(),
+    ///            [65280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);


This should be [255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0].

Yep, good catch!

frewsxcv · 2016-11-18T17:57:09Z

@bors r-

GuillaumeGomez · 2016-11-18T20:07:38Z

Updated.

@bors: delegate=frewsxcv

bors · 2016-11-18T20:07:40Z

✌️ @frewsxcv can now approve this pull request

frewsxcv · 2016-11-18T21:35:03Z

@bors r+ rollup

bors · 2016-11-18T21:35:06Z

📌 Commit f6c6ad9 has been approved by frewsxcv

nagisa · 2016-11-20T05:23:04Z

src/libstd/net/ip.rs

+    /// ```
+    /// use std::net::Ipv6Addr;
+    ///
+    /// let addr = Ipv6Addr::new(0, 0, 0, 0, 0, 65535, 49152, 767);


This is a bad example, should use hex instead, since that’s the representation used most commonly.

Compare:

# for `2002:c000:2ff::` aka `::ffff:192.0.2.255` let addr = Ipv6Addr::new(0, 0, 0, 0, 0, 0xffff, 0xc00a, 0x2ff);

Using an 6to4 address is not a good idea either.

nagisa · 2016-11-20T05:23:28Z

src/libstd/net/ip.rs

+    /// ```
+    /// use std::net::Ipv6Addr;
+    ///
+    /// assert_eq!(Ipv6Addr::new(0, 0, 0, 0, 0, 65535, 49152, 767).is_unspecified(), false);


Similarly, use hex please.

nagisa · 2016-11-20T05:24:49Z

src/libstd/net/ip.rs

+    /// fn main() {
+    ///     assert_eq!(Ipv6Addr::new(0, 0, 0, 0, 0, 65535, 49152, 767).is_global(), true);
+    ///     assert_eq!(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1).is_global(), false);
+    ///     assert_eq!(Ipv6Addr::new(0, 0, 457, 0, 0, 45000, 0, 1).is_global(), true);


Compare:

# for ::1c9:0:0:afc8:0:1 Ipv6Addr::new(0, 0, 0x1c9, 0, 0, 0xafc8, 0, 1)

GuillaumeGomez · 2016-11-20T10:06:03Z

@bors: r-

GuillaumeGomez · 2016-11-20T10:20:44Z

Updated.

nagisa · 2016-11-20T13:28:19Z

src/libstd/net/ip.rs

+    /// fn main() {
+    ///     assert_eq!(Ipv6Addr::new(0, 0, 0, 0, 0, 0xffff, 0xc00a, 0x2ff).is_global(), true);
+    ///     assert_eq!(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0x1).is_global(), false);
+    ///     assert_eq!(Ipv6Addr::new(0, 0, 0x1C9, 0, 0, 0xafc8, 0, 0x1).is_global(), true);


C in 0x1c9 is uppercase, despite of everything else being lowercase.

Nice catch!

nagisa · 2016-11-20T13:36:21Z

src/libstd/net/ip.rs

+    ///
+    /// assert_eq!(Ipv6Addr::new(0xff00, 0, 0, 0, 0, 0, 0, 0).to_ipv4(), None);
+    /// assert_eq!(Ipv6Addr::new(0, 0, 0, 0, 0, 0xffff, 0xc00a, 0x2ff).to_ipv4(),
+    ///            Some(Ipv4Addr::new(127, 0, 0, 1)));


This example doesn’t look right. 127.0.0.1 is ::ffff:7f00:0001. What you have there now is 192.10.2.255.

Arf, indeed. Bad conversion!

Probably also a good idea to show that e.g. ::1 converts to a 0.0.0.1 rather than None (i.e. it does both decimal and 4to6 conversions)

GuillaumeGomez · 2016-11-20T13:43:13Z

Updated.

nagisa · 2016-11-22T05:54:55Z

r=me

I also wrote a comment like this:

Probably also a good idea to show that e.g. ::1 converts to a 0.0.0.1 rather than None (i.e. it does both decimal and 4to6 conversions)

which got immediately hidden by a commit, but even without that the PR looks fine to me now.

GuillaumeGomez · 2016-11-22T10:30:02Z

Then let's let @frewsxcv decide. :)

frewsxcv · 2016-11-22T14:25:02Z

/checkout/src/libstd/net/ip.rs:669: line longer than 100 chars
/checkout/src/libstd/net/ip.rs:684: line longer than 100 chars

I think it would be good to include @nagisa's example, but I don't feel strongly.

r=me with these changes.

GuillaumeGomez · 2016-11-22T16:07:37Z

@bors: r=nagisa

Thanks to both @frewsxcv and @nagisa for this review. :)

bors · 2016-11-22T16:07:39Z

📌 Commit 57be2d9 has been approved by nagisa

GuillaumeGomez · 2016-11-23T11:17:44Z

@bors: r-

Rollup of 7 pull requests - Successful merges: #37442, #37760, #37836, #37851, #37859, #37913, #37925 - Failed merges:

GuillaumeGomez · 2016-11-29T21:47:46Z

@bors: r+ rollup

bors · 2016-11-29T21:47:47Z

📌 Commit a5049f7 has been approved by GuillaumeGomez

GuillaumeGomez · 2016-11-29T21:48:06Z

@bors: r=nagisa

bors · 2016-11-29T21:48:08Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Show multiline spans in full if short enough #37369

bors · 2016-11-29T21:48:08Z

📌 Commit a5049f7 has been approved by nagisa

@steveklabnik

Add missing examples for Ipv6Addr r? @steveklabnik cc @frewsxcv

@steveklabnik

Add missing examples for Ipv6Addr r? @steveklabnik cc @frewsxcv

Rollup of 15 pull requests - Successful merges: #37859, #37919, #38020, #38028, #38029, #38065, #38073, #38077, #38089, #38090, #38096, #38112, #38113, #38130, #38141 - Failed merges:

rust-highfive assigned steveklabnik Nov 18, 2016

ollie27 reviewed Nov 18, 2016

View reviewed changes

GuillaumeGomez force-pushed the net_examples branch from ab27645 to f6c6ad9 Compare November 18, 2016 20:07

nagisa reviewed Nov 20, 2016

View reviewed changes

GuillaumeGomez force-pushed the net_examples branch from f6c6ad9 to cddb062 Compare November 20, 2016 10:20

nagisa reviewed Nov 20, 2016

View reviewed changes

GuillaumeGomez force-pushed the net_examples branch from cddb062 to 6ae20df Compare November 20, 2016 13:42

BurntSushi added the A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools label Nov 21, 2016

GuillaumeGomez mentioned this pull request Nov 22, 2016

Ipv6 to ipv4 #37932

Closed

Add missing examples for Ipv6Addr

1a91fc6

GuillaumeGomez force-pushed the net_examples branch from 6ae20df to 1a91fc6 Compare November 22, 2016 15:49

GuillaumeGomez mentioned this pull request Nov 22, 2016

Rollup of 7 pull requests #37937

Merged

Add ::1 example in IPv6 to IPv4 conversion

a5049f7

GuillaumeGomez force-pushed the net_examples branch from 57be2d9 to a5049f7 Compare November 23, 2016 11:24

bors added a commit that referenced this pull request Nov 23, 2016

Auto merge of #37937 - GuillaumeGomez:rollup, r=GuillaumeGomez

127a83d

Rollup of 7 pull requests - Successful merges: #37442, #37760, #37836, #37851, #37859, #37913, #37925 - Failed merges:

dns2utf8 added a commit to dns2utf8/rust that referenced this pull request Dec 1, 2016

Rollup merge of rust-lang#37859 - GuillaumeGomez:net_examples, r=nagisa

8de607c

Add missing examples for Ipv6Addr r? @steveklabnik cc @frewsxcv

dns2utf8 mentioned this pull request Dec 1, 2016

Rollup of 8 pull requests #38106

Closed

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Dec 3, 2016

Rollup merge of rust-lang#37859 - GuillaumeGomez:net_examples, r=nagisa

bf99183

Add missing examples for Ipv6Addr r? @steveklabnik cc @frewsxcv

frewsxcv mentioned this pull request Dec 3, 2016

Rollup of 15 pull requests #38148

Merged

bors merged commit a5049f7 into rust-lang:master Dec 4, 2016

GuillaumeGomez deleted the net_examples branch December 4, 2016 07:21

Add missing examples for Ipv6Addr #37859

Add missing examples for Ipv6Addr #37859

Uh oh!

Conversation

GuillaumeGomez commented Nov 18, 2016

Uh oh!

frewsxcv commented Nov 18, 2016

Uh oh!

frewsxcv commented Nov 18, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

frewsxcv commented Nov 18, 2016

Uh oh!

GuillaumeGomez commented Nov 18, 2016

Uh oh!

bors commented Nov 18, 2016

Uh oh!

frewsxcv commented Nov 18, 2016

Uh oh!

bors commented Nov 18, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez commented Nov 20, 2016

Uh oh!

GuillaumeGomez commented Nov 20, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez commented Nov 20, 2016

Uh oh!

nagisa commented Nov 22, 2016

Uh oh!

GuillaumeGomez commented Nov 22, 2016

Uh oh!

frewsxcv commented Nov 22, 2016

Uh oh!

GuillaumeGomez commented Nov 22, 2016

Uh oh!

bors commented Nov 22, 2016

Uh oh!

GuillaumeGomez commented Nov 23, 2016

Uh oh!

GuillaumeGomez commented Nov 29, 2016

Uh oh!

bors commented Nov 29, 2016

Uh oh!

GuillaumeGomez commented Nov 29, 2016

Uh oh!

bors commented Nov 29, 2016

Uh oh!

bors commented Nov 29, 2016

Uh oh!

Uh oh!