@@ -55,69 +55,72 @@ where
55
55
/// Create a new interceptor layer.
56
56
///
57
57
/// See [`Interceptor`] for more details.
58
- pub fn interceptor < F > ( f : F ) -> InterceptorLayer < F >
58
+ pub fn interceptor < I > ( interceptor : I ) -> InterceptorLayer < I >
59
59
where
60
- F : Interceptor ,
60
+ I : Interceptor ,
61
61
{
62
- InterceptorLayer { f }
62
+ InterceptorLayer { interceptor }
63
63
}
64
64
65
65
/// A gRPC interceptor that can be used as a [`Layer`],
66
66
/// created by calling [`interceptor`].
67
67
///
68
68
/// See [`Interceptor`] for more details.
69
69
#[ derive( Debug , Clone , Copy ) ]
70
- pub struct InterceptorLayer < F > {
71
- f : F ,
70
+ pub struct InterceptorLayer < I > {
71
+ interceptor : I ,
72
72
}
73
73
74
- impl < S , F > Layer < S > for InterceptorLayer < F >
74
+ impl < S , I > Layer < S > for InterceptorLayer < I >
75
75
where
76
- F : Interceptor + Clone ,
76
+ I : Interceptor + Clone ,
77
77
{
78
- type Service = InterceptedService < S , F > ;
78
+ type Service = InterceptedService < S , I > ;
79
79
80
80
fn layer ( & self , service : S ) -> Self :: Service {
81
- InterceptedService :: new ( service, self . f . clone ( ) )
81
+ InterceptedService :: new ( service, self . interceptor . clone ( ) )
82
82
}
83
83
}
84
84
85
85
/// A service wrapped in an interceptor middleware.
86
86
///
87
87
/// See [`Interceptor`] for more details.
88
88
#[ derive( Clone , Copy ) ]
89
- pub struct InterceptedService < S , F > {
89
+ pub struct InterceptedService < S , I > {
90
90
inner : S ,
91
- f : F ,
91
+ interceptor : I ,
92
92
}
93
93
94
- impl < S , F > InterceptedService < S , F > {
94
+ impl < S , I > InterceptedService < S , I > {
95
95
/// Create a new `InterceptedService` that wraps `S` and intercepts each request with the
96
96
/// function `F`.
97
- pub fn new ( service : S , f : F ) -> Self
97
+ pub fn new ( service : S , interceptor : I ) -> Self
98
98
where
99
- F : Interceptor ,
99
+ I : Interceptor ,
100
100
{
101
- Self { inner : service, f }
101
+ Self {
102
+ inner : service,
103
+ interceptor,
104
+ }
102
105
}
103
106
}
104
107
105
- impl < S , F > fmt:: Debug for InterceptedService < S , F >
108
+ impl < S , I > fmt:: Debug for InterceptedService < S , I >
106
109
where
107
110
S : fmt:: Debug ,
108
111
{
109
112
fn fmt ( & self , f : & mut fmt:: Formatter < ' _ > ) -> fmt:: Result {
110
113
f. debug_struct ( "InterceptedService" )
111
114
. field ( "inner" , & self . inner )
112
- . field ( "f" , & format_args ! ( "{}" , std:: any:: type_name:: <F >( ) ) )
115
+ . field ( "f" , & format_args ! ( "{}" , std:: any:: type_name:: <I >( ) ) )
113
116
. finish ( )
114
117
}
115
118
}
116
119
117
- impl < S , F , ReqBody , ResBody > Service < http:: Request < ReqBody > > for InterceptedService < S , F >
120
+ impl < S , I , ReqBody , ResBody > Service < http:: Request < ReqBody > > for InterceptedService < S , I >
118
121
where
119
122
S : Service < http:: Request < ReqBody > , Response = http:: Response < ResBody > > ,
120
- F : Interceptor ,
123
+ I : Interceptor ,
121
124
ResBody : Default ,
122
125
{
123
126
type Response = http:: Response < ResBody > ;
@@ -142,7 +145,7 @@ where
142
145
let ( metadata, extensions, msg) = req. into_parts ( ) ;
143
146
144
147
match self
145
- . f
148
+ . interceptor
146
149
. call ( crate :: Request :: from_parts ( metadata, extensions, ( ) ) )
147
150
{
148
151
Ok ( req) => {
@@ -157,7 +160,7 @@ where
157
160
}
158
161
159
162
// required to use `InterceptedService` with `Router`
160
- impl < S , F > crate :: server:: NamedService for InterceptedService < S , F >
163
+ impl < S , I > crate :: server:: NamedService for InterceptedService < S , I >
161
164
where
162
165
S : crate :: server:: NamedService ,
163
166
{
0 commit comments