dev: v43 (#303)

linkerd/dev@76df6dc

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
     "name": "linkerd2-proxy-api",
-    "image": "ghcr.io/linkerd/dev:v42",
+    "image": "ghcr.io/linkerd/dev:v43",
     "customizations": {
         "vscode": {
             "extensions": [

.github/workflows/actions.yml

@@ -14,13 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v42
+      - uses: linkerd/dev/actions/setup-tools@v43
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just-dev lint-actions
 
   devcontainer-versions:
     runs-on: ubuntu-latest
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v42
+      - uses: linkerd/dev/actions/setup-tools@v43
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just-dev check-action-images

.github/workflows/go.yml

@@ -16,7 +16,7 @@ jobs:
   go:
     timeout-minutes: 5
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v42-go
+    container: docker://ghcr.io/linkerd/dev:v43-go
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just go-mod-check

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
   test:
     timeout-minutes: 5
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v42-rust
+    container: docker://ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just rs-fetch
@@ -55,7 +55,7 @@ jobs:
       contents: write
     timeout-minutes: 5
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v42-rust
+    container: docker://ghcr.io/linkerd/dev:v43-rust
     steps:
       - if: needs.meta.outputs.publish
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
@@ -79,7 +79,7 @@ jobs:
     needs: [meta, release]
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v42-rust
+    container: docker://ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - if: '!needs.meta.outputs.publish'

.github/workflows/rust.yml

@@ -22,7 +22,7 @@ jobs:
   gen-check:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v42-rust
+    container: docker://ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just rs-fetch
@@ -31,7 +31,7 @@ jobs:
   rust-clippy:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v42-rust
+    container: docker://ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just rs-fetch
@@ -40,7 +40,7 @@ jobs:
   rust-docs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v42-rust
+    container: docker://ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just rs-fetch
@@ -49,7 +49,7 @@ jobs:
   rust-test:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v42-rust
+    container: docker://ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just rs-fetch

justfile

@@ -48,6 +48,8 @@ rs-check-fmt:
 rs-check *flags:
     {{ _cargo }} check --all-targets {{ _features }} {{ flags }}
 
+alias clippy := rs-clippy
+
 # Lint Rust code
 rs-clippy *flags:
     {{ _cargo }} clippy --all-targets {{ _features }} {{ flags }}

src/net.rs

@@ -26,10 +26,8 @@ impl TryFrom<IpAddress> for std::net::IpAddr {
     fn try_from(ip: IpAddress) -> Result<Self, Self::Error> {
         use ip_address::Ip;
         match ip.ip {
-            Some(Ip::Ipv4(octets)) => Ok(std::net::Ipv4Addr::from(octets).into()),
-            Some(Ip::Ipv6(v6)) => std::net::Ipv6Addr::try_from(v6)
-                .map(Into::into)
-                .map_err(|_| InvalidIpAddress),
+            Some(Ip::Ipv4(v4)) => Ok(std::net::IpAddr::V4(v4.into())),
+            Some(Ip::Ipv6(v6)) => Ok(std::net::IpAddr::V6(v6.into())),
             None => Err(InvalidIpAddress),
         }
     }