From 2ce2d2d418ff4a55cf298cf28511252b93084c54 Mon Sep 17 00:00:00 2001
From: Peter Johnston <peterjohnston@google.com>
Date: Wed, 29 May 2024 17:38:01 +0000
Subject: [PATCH] [netstack3] Remove workaround for associated type bounds

Now that associated type bounds are stabilized in rustc (see
https://github.com/rust-lang/rust/pull/122055), we can remove the
workaround used in the IP crate to put filtering constraints on the
device ID type.

Change-Id: I80a9d6ce9553ff64f5f7a209dccb26d667a1753b
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1055952
Fuchsia-Auto-Submit: Peter Johnston <peterjohnston@google.com>
Reviewed-by: Bruno Dal Bo <brunodalbo@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
---
 .../network/netstack3/core/ip/src/base.rs     | 34 ++++++-------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/connectivity/network/netstack3/core/ip/src/base.rs b/src/connectivity/network/netstack3/core/ip/src/base.rs
index 05064b962f9..117fbf1f0a3 100644
--- a/src/connectivity/network/netstack3/core/ip/src/base.rs
+++ b/src/connectivity/network/netstack3/core/ip/src/base.rs
@@ -974,7 +974,7 @@ pub trait IpLayerIngressContext<
     I: IpLayerIpExt + IcmpHandlerIpExt,
     BC: IpLayerBindingsContext<I, Self::DeviceId>,
 >:
-    IpTransportDispatchContext<I, BC, DeviceId = Self::DeviceId_>
+    IpTransportDispatchContext<I, BC, DeviceId: filter::InterfaceProperties<BC::DeviceClass>>
     + IpDeviceStateContext<I, BC>
     + IpDeviceSendContext<I, BC>
     + IcmpErrorHandler<I, BC>
@@ -983,20 +983,16 @@ pub trait IpLayerIngressContext<
     + FilterHandlerProvider<I, BC>
     + RawIpSocketHandler<I, BC>
 {
-    // This is working around the fact that currently, where clauses are only
-    // elaborated for supertraits, and not, for example, bounds on associated types
-    // as we have here.
-    //
-    // See https://github.com/rust-lang/rust/issues/20671#issuecomment-1905186183
-    // for more discussion.
-    type DeviceId_: filter::InterfaceProperties<BC::DeviceClass> + Debug;
 }
 
 impl<
         I: IpLayerIpExt + IcmpHandlerIpExt,
         BC: IpLayerBindingsContext<I, CC::DeviceId>,
-        CC: IpTransportDispatchContext<I, BC>
-            + IpDeviceStateContext<I, BC>
+        CC: IpTransportDispatchContext<
+                I,
+                BC,
+                DeviceId: filter::InterfaceProperties<BC::DeviceClass>,
+            > + IpDeviceStateContext<I, BC>
             + IpDeviceSendContext<I, BC>
             + IcmpErrorHandler<I, BC>
             + IpLayerContext<I, BC>
@@ -1004,36 +1000,26 @@ impl<
             + FilterHandlerProvider<I, BC>
             + RawIpSocketHandler<I, BC>,
     > IpLayerIngressContext<I, BC> for CC
-where
-    Self::DeviceId: filter::InterfaceProperties<BC::DeviceClass>,
 {
-    type DeviceId_ = Self::DeviceId;
 }
 
 /// A marker trait for all the contexts required for IP egress.
 pub(crate) trait IpLayerEgressContext<I, BC>:
-    IpDeviceSendContext<I, BC, DeviceId = Self::DeviceId_> + FilterHandlerProvider<I, BC>
+    IpDeviceSendContext<I, BC, DeviceId: filter::InterfaceProperties<BC::DeviceClass>>
+    + FilterHandlerProvider<I, BC>
 where
     I: IpLayerIpExt,
     BC: FilterBindingsContext,
 {
-    // This is working around the fact that currently, where clauses are only
-    // elaborated for supertraits, and not, for example, bounds on associated types
-    // as we have here.
-    //
-    // See https://github.com/rust-lang/rust/issues/20671#issuecomment-1905186183
-    // for more discussion.
-    type DeviceId_: filter::InterfaceProperties<BC::DeviceClass> + StrongDeviceIdentifier + Debug;
 }
 
 impl<I, BC, CC> IpLayerEgressContext<I, BC> for CC
 where
     I: IpLayerIpExt,
     BC: FilterBindingsContext,
-    CC: IpDeviceSendContext<I, BC> + FilterHandlerProvider<I, BC>,
-    Self::DeviceId: filter::InterfaceProperties<BC::DeviceClass>,
+    CC: IpDeviceSendContext<I, BC, DeviceId: filter::InterfaceProperties<BC::DeviceClass>>
+        + FilterHandlerProvider<I, BC>,
 {
-    type DeviceId_ = Self::DeviceId;
 }
 
 /// A builder for IPv4 state.