Rollup merge of rust-lang#127182 - danielhuang:patch-4, r=Nilstrieb

matthiaskrgr · web-flow · commit 6c3359cdb0b6 · 2024-07-01T08:53:08.000+02:00
Fix error in documentation for IpAddr::to_canonical and Ipv6Addr::to_canonical
diff --git a/core/src/net/ip_addr.rs b/core/src/net/ip_addr.rs
@@ -406,7 +406,7 @@ impl IpAddr {
         matches!(self, IpAddr::V6(_))
     }
 
-    /// Converts this address to an `IpAddr::V4` if it is an IPv4-mapped IPv6 addresses, otherwise it
+    /// Converts this address to an `IpAddr::V4` if it is an IPv4-mapped IPv6 address, otherwise it
     /// returns `self` as-is.
     ///
     /// # Examples
@@ -1879,7 +1879,7 @@ impl Ipv6Addr {
         }
     }
 
-    /// Converts this address to an `IpAddr::V4` if it is an IPv4-mapped addresses, otherwise it
+    /// Converts this address to an `IpAddr::V4` if it is an IPv4-mapped address, otherwise it
     /// returns self wrapped in an `IpAddr::V6`.
     ///
     /// # Examples

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ impl IpAddr {`
`406`	`406`	`matches!(self, IpAddr::V6(_))`
`407`	`407`	`}`
`408`	`408`
`409`		- /// Converts this address to an `IpAddr::V4` if it is an IPv4-mapped IPv6 addresses, otherwise it
	`409`	+ /// Converts this address to an `IpAddr::V4` if it is an IPv4-mapped IPv6 address, otherwise it
`410`	`410`	/// returns `self` as-is.
`411`	`411`	`///`
`412`	`412`	`/// # Examples`
`@@ -1879,7 +1879,7 @@ impl Ipv6Addr {`
`1879`	`1879`	`}`
`1880`	`1880`	`}`
`1881`	`1881`
`1882`		- /// Converts this address to an `IpAddr::V4` if it is an IPv4-mapped addresses, otherwise it
	`1882`	+ /// Converts this address to an `IpAddr::V4` if it is an IPv4-mapped address, otherwise it
`1883`	`1883`	/// returns self wrapped in an `IpAddr::V6`.
`1884`	`1884`	`///`
`1885`	`1885`	`/// # Examples`