Add support to remaining android targets

For armv7-linux-androideabi and i686-linux-android.

.github/workflows/main.yml

@@ -56,7 +56,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- target: ["aarch64-apple-ios", "aarch64-linux-android", "x86_64-apple-darwin", "x86_64-unknown-fuchsia", "x86_64-pc-windows-msvc", "x86_64-pc-solaris", "x86_64-unknown-freebsd", "x86_64-unknown-illumos", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-netbsd", "x86_64-unknown-redox"]
+ target: ["aarch64-apple-ios", "aarch64-linux-android", "x86_64-apple-darwin", "x86_64-unknown-fuchsia", "x86_64-pc-windows-msvc", "x86_64-pc-solaris", "x86_64-unknown-freebsd", "x86_64-unknown-illumos", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-netbsd", "x86_64-unknown-redox", "armv7-linux-androideabi", "i686-linux-android"]
  steps:
  - uses: actions/checkout@v3
  - uses: dtolnay/rust-toolchain@stable
@@ -79,7 +79,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- target: ["aarch64-apple-ios", "aarch64-linux-android", "x86_64-apple-darwin", "x86_64-unknown-fuchsia", "x86_64-pc-windows-msvc", "x86_64-pc-solaris", "x86_64-unknown-freebsd", "x86_64-unknown-illumos", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-netbsd", "x86_64-unknown-redox"]
+ target: ["aarch64-apple-ios", "aarch64-linux-android", "x86_64-apple-darwin", "x86_64-unknown-fuchsia", "x86_64-pc-windows-msvc", "x86_64-pc-solaris", "x86_64-unknown-freebsd", "x86_64-unknown-illumos", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-netbsd", "x86_64-unknown-redox", "armv7-linux-androideabi", "i686-linux-android"]
  steps:
  - uses: actions/checkout@v3
  - uses: dtolnay/rust-toolchain@nightly # NOTE: need nightly for `doc_cfg` feature.

Cargo.toml

@@ -29,7 +29,7 @@ include = [
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
-targets = ["aarch64-apple-ios", "aarch64-linux-android", "x86_64-apple-darwin", "x86_64-unknown-fuchsia", "x86_64-pc-windows-msvc", "x86_64-pc-solaris", "x86_64-unknown-freebsd", "x86_64-unknown-illumos", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-netbsd", "x86_64-unknown-redox"]
+targets = ["aarch64-apple-ios", "aarch64-linux-android", "x86_64-apple-darwin", "x86_64-unknown-fuchsia", "x86_64-pc-windows-msvc", "x86_64-pc-solaris", "x86_64-unknown-freebsd", "x86_64-unknown-illumos", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-netbsd", "x86_64-unknown-redox", "armv7-linux-androideabi", "i686-linux-android"]
 
 [package.metadata.playground]
 features = ["all"]

Makefile

@@ -1,6 +1,6 @@
 # Targets available via Rustup that are supported.
 # NOTE: keep in sync with the CI and docs.rs targets.
-TARGETS ?= "aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-unknown-fuchsia" "x86_64-pc-windows-msvc" "x86_64-pc-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-illumos" "x86_64-unknown-linux-gnu" "x86_64-unknown-linux-musl" "x86_64-unknown-netbsd" "x86_64-unknown-redox"
+TARGETS ?= "aarch64-apple-ios" "aarch64-linux-android" "x86_64-apple-darwin" "x86_64-unknown-fuchsia" "x86_64-pc-windows-msvc" "x86_64-pc-solaris" "x86_64-unknown-freebsd" "x86_64-unknown-illumos" "x86_64-unknown-linux-gnu" "x86_64-unknown-linux-musl" "x86_64-unknown-netbsd" "x86_64-unknown-redox" "armv7-linux-androideabi" "i686-linux-android"
 
 test:
  cargo test --all-features

src/sys/unix.rs

@@ -691,7 +691,7 @@ impl SockAddr {
  pub fn is_unnamed(&self) -> bool {
  self.as_sockaddr_un()
  .map(|storage| {
- self.len() == offset_of_path(storage) as u32
+ self.len() == offset_of_path(storage) as _
  // On some non-linux platforms a zeroed path is returned for unnamed.
  // Abstract addresses only exist on Linux.
  // NOTE: although Fuchsia does define `AF_UNIX` it's not actually implemented.
@@ -754,7 +754,7 @@ impl SockAddr {
  /// pathname address, otherwise returns `None`.
  pub fn as_pathname(&self) -> Option<&Path> {
  self.as_sockaddr_un().and_then(|storage| {
- (self.len() > offset_of_path(storage) as u32 && storage.sun_path[0] != 0).then(|| {
+ (self.len() > offset_of_path(storage) as _ && storage.sun_path[0] != 0).then(|| {
  let path_slice = self.path_bytes(storage, false);
  Path::new::<OsStr>(OsStrExt::from_bytes(path_slice))
  })
@@ -772,7 +772,7 @@ impl SockAddr {
  #[cfg(any(target_os = "linux", target_os = "android"))]
  {
  self.as_sockaddr_un().and_then(|storage| {
- (self.len() > offset_of_path(storage) as u32 && storage.sun_path[0] == 0)
+ (self.len() > offset_of_path(storage) as _ && storage.sun_path[0] == 0)
  .then(|| self.path_bytes(storage, true))
  })
  }