cpet
/
freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang/rust-nightly: Update to 1.68.0.20221225

This commit is contained in:
Mikael Urankar 2022-12-26 10:43:56 +01:00
parent a177244583
commit e026a59380
3 changed files with 293 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/rust-nightly/Makefile
View File

@ -1,5 +1,5 @@
# Run update.sh to update to the latest nightly
PORTVERSION= 1.66.0.${NIGHTLY_DATE:C,-,,g}
PORTVERSION= 1.68.0.${NIGHTLY_DATE:C,-,,g}
# Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust
PORTREVISION= 0
PKGNAMESUFFIX= -nightly
@ -14,8 +14,8 @@ MASTERDIR= ${.CURDIR}/../rust
PATCHDIR= ${.CURDIR}/files
DISTINFO_FILE= ${.CURDIR}/distinfo
NIGHTLY_DATE= 2022-10-06
BOOTSTRAPS_DATE= 2022-09-20
NIGHTLY_DATE= 2022-12-25
BOOTSTRAPS_DATE= 2022-11-01
RUST_BOOTSTRAP_VERSION= beta
.include "${MASTERDIR}/Makefile"

18
lang/rust-nightly/distinfo
View File

@ -1,9 +1,9 @@
TIMESTAMP = 1665156753
SHA256 (rust/2022-10-06/rustc-nightly-src.tar.xz) = 5aa6519089a401ed6c3a2c3e171576a8a54894f6b08f5e18f31f7c2e6acfef20
SIZE (rust/2022-10-06/rustc-nightly-src.tar.xz) = 139885160
SHA256 (rust/2022-09-20/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 515b35360865016b7efe6f973730ce4c66021df0edeed8eb490b69f4bf50006d
SIZE (rust/2022-09-20/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 77524560
SHA256 (rust/2022-09-20/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 14787b285c55ab885d1360897849882eac861f36029cc72ec9819d035998ee9f
SIZE (rust/2022-09-20/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 31248736
SHA256 (rust/2022-09-20/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 20b46e126c900892d576e972e39409c9009bafa4b3c159e624179d77afa912a9
SIZE (rust/2022-09-20/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6928264
TIMESTAMP = 1672043223
SHA256 (rust/2022-12-25/rustc-nightly-src.tar.xz) = 580fabda19f0314d789cf657b0fff803239d71cd41417c5948adfb80e0b69a17
SIZE (rust/2022-12-25/rustc-nightly-src.tar.xz) = 143460584
SHA256 (rust/2022-11-01/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 4572c19bf416c188a3691cc9542422b92a124594bdf83c82213d07a3aaeef465
SIZE (rust/2022-11-01/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 77640904
SHA256 (rust/2022-11-01/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = ee5b9158ca0c2e829bb79ac526d17a2ba27ca4e305e134241ba1f8347a9bace5
SIZE (rust/2022-11-01/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 30572092
SHA256 (rust/2022-11-01/cargo-beta-x86_64-unknown-freebsd.tar.xz) = de602b7802b1448a861df05c41430dcde4f07358a05711784a1ca37836525b74
SIZE (rust/2022-11-01/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6949620

281
lang/rust-nightly/files/patch-issues105467 Normal file
View File

@ -0,0 +1,281 @@
https://github.com/rust-lang/rust/issues/105467
revert of https://github.com/rust-lang/rust/commit/8f1e6eba343452ac48412f11d57aa7d206c8c3dd
--- library/std/src/os/android/net.rs.orig 2022-12-26 09:18:12 UTC
+++ library/std/src/os/android/net.rs
@@ -1,9 +1,4 @@
//! Android-specific networking functionality.
#![unstable(feature = "tcp_quickack", issue = "96256")]
-
-#[unstable(feature = "unix_socket_abstract", issue = "85410")]
-pub use crate::os::net::linux_ext::addr::SocketAddrExt;
-
-#[unstable(feature = "tcp_quickack", issue = "96256")]
pub use crate::os::net::linux_ext::tcp::TcpStreamExt;
--- library/std/src/os/linux/net.rs.orig 2022-12-26 09:18:17 UTC
+++ library/std/src/os/linux/net.rs
@@ -1,9 +1,4 @@
//! Linux-specific networking functionality.
#![unstable(feature = "tcp_quickack", issue = "96256")]
-
-#[unstable(feature = "unix_socket_abstract", issue = "85410")]
-pub use crate::os::net::linux_ext::addr::SocketAddrExt;
-
-#[unstable(feature = "tcp_quickack", issue = "96256")]
pub use crate::os::net::linux_ext::tcp::TcpStreamExt;
--- library/std/src/os/net/linux_ext/mod.rs.orig 2022-12-26 09:15:03 UTC
+++ library/std/src/os/net/linux_ext/mod.rs
@@ -2,9 +2,6 @@
#![doc(cfg(any(target_os = "linux", target_os = "android")))]
-#[unstable(feature = "unix_socket_abstract", issue = "85410")]
-pub(crate) mod addr;
-
#[unstable(feature = "tcp_quickack", issue = "96256")]
pub(crate) mod tcp;
--- library/std/src/os/unix/net/addr.rs.orig 2022-12-24 20:24:15 UTC
+++ library/std/src/os/unix/net/addr.rs
@@ -1,9 +1,6 @@ use crate::ffi::OsStr;
use crate::ffi::OsStr;
-#[cfg(any(doc, target_os = "android", target_os = "linux"))]
-use crate::os::net::linux_ext;
use crate::os::unix::ffi::OsStrExt;
use crate::path::Path;
-use crate::sealed::Sealed;
use crate::sys::cvt;
use crate::{fmt, io, mem, ptr};
@@ -227,6 +224,31 @@ impl SocketAddr {
if let AddressKind::Pathname(path) = self.address() { Some(path) } else { None }
}
+ /// Returns the contents of this address if it is an abstract namespace
+ /// without the leading null byte.
+ ///
+ /// # Examples
+ ///
+ /// ```no_run
+ /// #![feature(unix_socket_abstract)]
+ /// use std::os::unix::net::{UnixListener, SocketAddr};
+ ///
+ /// fn main() -> std::io::Result<()> {
+ /// let namespace = b"hidden";
+ /// let namespace_addr = SocketAddr::from_abstract_namespace(&namespace[..])?;
+ /// let socket = UnixListener::bind_addr(&namespace_addr)?;
+ /// let local_addr = socket.local_addr().expect("Couldn't get local address");
+ /// assert_eq!(local_addr.as_abstract_namespace(), Some(&namespace[..]));
+ /// Ok(())
+ /// }
+ /// ```
+ #[doc(cfg(any(target_os = "android", target_os = "linux")))]
+ #[cfg(any(doc, target_os = "android", target_os = "linux",))]
+ #[unstable(feature = "unix_socket_abstract", issue = "85410")]
+ pub fn as_abstract_namespace(&self) -> Option<&[u8]> {
+ if let AddressKind::Abstract(name) = self.address() { Some(name) } else { None }
+ }
+
fn address(&self) -> AddressKind<'_> {
let len = self.len as usize - sun_path_offset(&self.addr);
let path = unsafe { mem::transmute::<&[libc::c_char], &[u8]>(&self.addr.sun_path) };
@@ -243,41 +265,62 @@ impl SocketAddr {
AddressKind::Pathname(OsStr::from_bytes(&path[..len - 1]).as_ref())
}
}
-}
-#[unstable(feature = "unix_socket_abstract", issue = "85410")]
-impl Sealed for SocketAddr {}
-
-#[doc(cfg(any(target_os = "android", target_os = "linux")))]
-#[cfg(any(doc, target_os = "android", target_os = "linux"))]
-#[unstable(feature = "unix_socket_abstract", issue = "85410")]
-impl linux_ext::addr::SocketAddrExt for SocketAddr {
- fn as_abstract_name(&self) -> Option<&[u8]> {
- if let AddressKind::Abstract(name) = self.address() { Some(name) } else { None }
- }
-
- fn from_abstract_name<N>(name: &N) -> crate::io::Result<Self>
- where
- N: AsRef<[u8]>,
- {
- let name = name.as_ref();
+ /// Creates an abstract domain socket address from a namespace
+ ///
+ /// An abstract address does not create a file unlike traditional path-based
+ /// Unix sockets. The advantage of this is that the address will disappear when
+ /// the socket bound to it is closed, so no filesystem clean up is required.
+ ///
+ /// The leading null byte for the abstract namespace is automatically added.
+ ///
+ /// This is a Linux-specific extension. See more at [`unix(7)`].
+ ///
+ /// [`unix(7)`]: https://man7.org/linux/man-pages/man7/unix.7.html
+ ///
+ /// # Errors
+ ///
+ /// This will return an error if the given namespace is too long
+ ///
+ /// # Examples
+ ///
+ /// ```no_run
+ /// #![feature(unix_socket_abstract)]
+ /// use std::os::unix::net::{UnixListener, SocketAddr};
+ ///
+ /// fn main() -> std::io::Result<()> {
+ /// let addr = SocketAddr::from_abstract_namespace(b"hidden")?;
+ /// let listener = match UnixListener::bind_addr(&addr) {
+ /// Ok(sock) => sock,
+ /// Err(err) => {
+ /// println!("Couldn't bind: {err:?}");
+ /// return Err(err);
+ /// }
+ /// };
+ /// Ok(())
+ /// }
+ /// ```
+ #[doc(cfg(any(target_os = "android", target_os = "linux")))]
+ #[cfg(any(doc, target_os = "android", target_os = "linux",))]
+ #[unstable(feature = "unix_socket_abstract", issue = "85410")]
+ pub fn from_abstract_namespace(namespace: &[u8]) -> io::Result<SocketAddr> {
unsafe {
let mut addr: libc::sockaddr_un = mem::zeroed();
addr.sun_family = libc::AF_UNIX as libc::sa_family_t;
- if name.len() + 1 > addr.sun_path.len() {
+ if namespace.len() + 1 > addr.sun_path.len() {
return Err(io::const_io_error!(
io::ErrorKind::InvalidInput,
- "abstract socket name must be shorter than SUN_LEN",
+ "namespace must be shorter than SUN_LEN",
));
}
crate::ptr::copy_nonoverlapping(
- name.as_ptr(),
+ namespace.as_ptr(),
addr.sun_path.as_mut_ptr().add(1) as *mut u8,
- name.len(),
+ namespace.len(),
);
- let len = (sun_path_offset(&addr) + 1 + name.len()) as libc::socklen_t;
+ let len = (sun_path_offset(&addr) + 1 + namespace.len()) as libc::socklen_t;
SocketAddr::from_parts(addr, len)
}
}
--- library/std/src/os/unix/net/tests.rs.orig 2022-12-24 20:24:15 UTC
+++ library/std/src/os/unix/net/tests.rs
@@ -7,12 +7,6 @@ use crate::time::Duration;
use crate::thread;
use crate::time::Duration;
-#[cfg(target_os = "android")]
-use crate::os::android::net::SocketAddrExt;
-
-#[cfg(target_os = "linux")]
-use crate::os::linux::net::SocketAddrExt;
-
macro_rules! or_panic {
($e:expr) => {
match $e {
@@ -410,7 +404,7 @@ fn test_abstract_stream_connect() {
let msg1 = b"hello";
let msg2 = b"world";
- let socket_addr = or_panic!(SocketAddr::from_abstract_name(b"name"));
+ let socket_addr = or_panic!(SocketAddr::from_abstract_namespace(b"namespace"));
let listener = or_panic!(UnixListener::bind_addr(&socket_addr));
let thread = thread::spawn(move || {
@@ -424,7 +418,7 @@ fn test_abstract_stream_connect() {
let mut stream = or_panic!(UnixStream::connect_addr(&socket_addr));
let peer = or_panic!(stream.peer_addr());
- assert_eq!(peer.as_abstract_name().unwrap(), b"name");
+ assert_eq!(peer.as_abstract_namespace().unwrap(), b"namespace");
or_panic!(stream.write_all(msg1));
let mut buf = vec![];
@@ -438,7 +432,7 @@ fn test_abstract_stream_iter() {
#[cfg(any(target_os = "android", target_os = "linux"))]
#[test]
fn test_abstract_stream_iter() {
- let addr = or_panic!(SocketAddr::from_abstract_name(b"hidden"));
+ let addr = or_panic!(SocketAddr::from_abstract_namespace(b"hidden"));
let listener = or_panic!(UnixListener::bind_addr(&addr));
let thread = thread::spawn(move || {
@@ -460,13 +454,13 @@ fn test_abstract_datagram_bind_send_to_addr() {
#[cfg(any(target_os = "android", target_os = "linux"))]
#[test]
fn test_abstract_datagram_bind_send_to_addr() {
- let addr1 = or_panic!(SocketAddr::from_abstract_name(b"ns1"));
+ let addr1 = or_panic!(SocketAddr::from_abstract_namespace(b"ns1"));
let sock1 = or_panic!(UnixDatagram::bind_addr(&addr1));
let local = or_panic!(sock1.local_addr());
- assert_eq!(local.as_abstract_name().unwrap(), b"ns1");
+ assert_eq!(local.as_abstract_namespace().unwrap(), b"ns1");
- let addr2 = or_panic!(SocketAddr::from_abstract_name(b"ns2"));
+ let addr2 = or_panic!(SocketAddr::from_abstract_namespace(b"ns2"));
let sock2 = or_panic!(UnixDatagram::bind_addr(&addr2));
let msg = b"hello world";
@@ -475,13 +469,13 @@ fn test_abstract_datagram_bind_send_to_addr() {
let (len, addr) = or_panic!(sock2.recv_from(&mut buf));
assert_eq!(msg, &buf[..]);
assert_eq!(len, 11);
- assert_eq!(addr.as_abstract_name().unwrap(), b"ns1");
+ assert_eq!(addr.as_abstract_namespace().unwrap(), b"ns1");
}
#[cfg(any(target_os = "android", target_os = "linux"))]
#[test]
fn test_abstract_datagram_connect_addr() {
- let addr1 = or_panic!(SocketAddr::from_abstract_name(b"ns3"));
+ let addr1 = or_panic!(SocketAddr::from_abstract_namespace(b"ns3"));
let bsock1 = or_panic!(UnixDatagram::bind_addr(&addr1));
let sock = or_panic!(UnixDatagram::unbound());
@@ -495,7 +489,7 @@ fn test_abstract_datagram_connect_addr() {
assert_eq!(addr.is_unnamed(), true);
assert_eq!(msg, &buf[..]);
- let addr2 = or_panic!(SocketAddr::from_abstract_name(b"ns4"));
+ let addr2 = or_panic!(SocketAddr::from_abstract_namespace(b"ns4"));
let bsock2 = or_panic!(UnixDatagram::bind_addr(&addr2));
or_panic!(sock.connect_addr(&addr2));
@@ -505,8 +499,8 @@ fn test_abstract_datagram_connect_addr() {
#[cfg(any(target_os = "android", target_os = "linux"))]
#[test]
-fn test_abstract_name_too_long() {
- match SocketAddr::from_abstract_name(
+fn test_abstract_namespace_too_long() {
+ match SocketAddr::from_abstract_namespace(
b"abcdefghijklmnopqrstuvwxyzabcdefghijklmn\
opqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghi\
jklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz",
@@ -519,11 +513,11 @@ fn test_abstract_name_too_long() {
#[cfg(any(target_os = "android", target_os = "linux"))]
#[test]
-fn test_abstract_no_pathname_and_not_unnamed() {
- let name = b"local";
- let addr = or_panic!(SocketAddr::from_abstract_name(name));
+fn test_abstract_namespace_no_pathname_and_not_unnamed() {
+ let namespace = b"local";
+ let addr = or_panic!(SocketAddr::from_abstract_namespace(&namespace[..]));
assert_eq!(addr.as_pathname(), None);
- assert_eq!(addr.as_abstract_name(), Some(&name[..]));
+ assert_eq!(addr.as_abstract_namespace(), Some(&namespace[..]));
assert_eq!(addr.is_unnamed(), false);
}