talksik/tonic
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Fix clippy lint (#1181)

Browse Source
This commit is contained in:
tottoto
2022-12-13 11:29:29 -05:00
committed by GitHub
parent 3076e8251e
commit 2dd09c02bd
23 changed files with 98 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tonic/src/metadata/key.rs
+1 -1
View File
@@ -247,7 +247,7 @@ impl<VE: ValueEncoding> PartialEq<MetadataKey<VE>> for str {
/// ```
#[inline]
fn eq(&self, other: &MetadataKey<VE>) -> bool {
(*other).inner == *self
other.inner == *self
}
}
tonic/src/metadata/map.rs
+27 -27
View File
@@ -1362,7 +1362,7 @@ where
match self.inner {
Some(ref mut inner) => inner
.next()
.map(&MetadataValue::unchecked_from_header_value_ref),
.map(MetadataValue::unchecked_from_header_value_ref),
None => None,
}
}
@@ -1383,7 +1383,7 @@ where
match self.inner {
Some(ref mut inner) => inner
.next_back()
.map(&MetadataValue::unchecked_from_header_value_ref),
.map(MetadataValue::unchecked_from_header_value_ref),
None => None,
}
}
@@ -1400,7 +1400,7 @@ where
fn next(&mut self) -> Option<Self::Item> {
self.inner
.next()
.map(&MetadataValue::unchecked_from_mut_header_value_ref)
.map(MetadataValue::unchecked_from_mut_header_value_ref)
}
}
@@ -1411,7 +1411,7 @@ where
fn next_back(&mut self) -> Option<Self::Item> {
self.inner
.next_back()
.map(&MetadataValue::unchecked_from_mut_header_value_ref)
.map(MetadataValue::unchecked_from_mut_header_value_ref)
}
}
@@ -1992,7 +1992,7 @@ impl<'a, 'b: 'a, VE: ValueEncoding> IntoIterator for &'b GetAll<'a, VE> {
fn into_iter(self) -> ValueIter<'a, VE> {
ValueIter {
inner: (&self.inner).as_ref().map(|inner| inner.into_iter()),
inner: self.inner.as_ref().map(|inner| inner.into_iter()),
phantom: PhantomData,
}
}
@@ -2037,7 +2037,7 @@ mod into_metadata_key {
) -> Option<MetadataValue<VE>> {
map.headers
.insert(self.inner, val.inner)
.map(&MetadataValue::unchecked_from_header_value)
.map(MetadataValue::unchecked_from_header_value)
}
#[doc(hidden)]
@@ -2059,7 +2059,7 @@ mod into_metadata_key {
) -> Option<MetadataValue<VE>> {
map.headers
.insert(&self.inner, val.inner)
.map(&MetadataValue::unchecked_from_header_value)
.map(MetadataValue::unchecked_from_header_value)
}
#[doc(hidden)]
#[inline]
@@ -2083,7 +2083,7 @@ mod into_metadata_key {
map.headers
.insert(key.inner, val.inner)
.map(&MetadataValue::unchecked_from_header_value)
.map(MetadataValue::unchecked_from_header_value)
}
#[doc(hidden)]
#[inline]
@@ -2141,7 +2141,7 @@ mod as_metadata_key {
fn get(self, map: &MetadataMap) -> Option<&MetadataValue<VE>> {
map.headers
.get(self.inner)
.map(&MetadataValue::unchecked_from_header_value_ref)
.map(MetadataValue::unchecked_from_header_value_ref)
}
#[doc(hidden)]
@@ -2149,7 +2149,7 @@ mod as_metadata_key {
fn get_mut(self, map: &mut MetadataMap) -> Option<&mut MetadataValue<VE>> {
map.headers
.get_mut(self.inner)
.map(&MetadataValue::unchecked_from_mut_header_value_ref)
.map(MetadataValue::unchecked_from_mut_header_value_ref)
}
#[doc(hidden)]
@@ -2172,7 +2172,7 @@ mod as_metadata_key {
fn remove(self, map: &mut MetadataMap) -> Option<MetadataValue<VE>> {
map.headers
.remove(self.inner)
.map(&MetadataValue::unchecked_from_header_value)
.map(MetadataValue::unchecked_from_header_value)
}
}
@@ -2184,7 +2184,7 @@ mod as_metadata_key {
fn get(self, map: &MetadataMap) -> Option<&MetadataValue<VE>> {
map.headers
.get(&self.inner)
.map(&MetadataValue::unchecked_from_header_value_ref)
.map(MetadataValue::unchecked_from_header_value_ref)
}
#[doc(hidden)]
@@ -2192,7 +2192,7 @@ mod as_metadata_key {
fn get_mut(self, map: &mut MetadataMap) -> Option<&mut MetadataValue<VE>> {
map.headers
.get_mut(&self.inner)
.map(&MetadataValue::unchecked_from_mut_header_value_ref)
.map(MetadataValue::unchecked_from_mut_header_value_ref)
}
#[doc(hidden)]
@@ -2215,7 +2215,7 @@ mod as_metadata_key {
fn remove(self, map: &mut MetadataMap) -> Option<MetadataValue<VE>> {
map.headers
.remove(&self.inner)
.map(&MetadataValue::unchecked_from_header_value)
.map(MetadataValue::unchecked_from_header_value)
}
}
@@ -2230,7 +2230,7 @@ mod as_metadata_key {
}
map.headers
.get(self)
.map(&MetadataValue::unchecked_from_header_value_ref)
.map(MetadataValue::unchecked_from_header_value_ref)
}
#[doc(hidden)]
@@ -2241,7 +2241,7 @@ mod as_metadata_key {
}
map.headers
.get_mut(self)
.map(&MetadataValue::unchecked_from_mut_header_value_ref)
.map(MetadataValue::unchecked_from_mut_header_value_ref)
}
#[doc(hidden)]
@@ -2277,7 +2277,7 @@ mod as_metadata_key {
}
map.headers
.remove(self)
.map(&MetadataValue::unchecked_from_header_value)
.map(MetadataValue::unchecked_from_header_value)
}
}
@@ -2292,7 +2292,7 @@ mod as_metadata_key {
}
map.headers
.get(self.as_str())
.map(&MetadataValue::unchecked_from_header_value_ref)
.map(MetadataValue::unchecked_from_header_value_ref)
}
#[doc(hidden)]
@@ -2303,7 +2303,7 @@ mod as_metadata_key {
}
map.headers
.get_mut(self.as_str())
.map(&MetadataValue::unchecked_from_mut_header_value_ref)
.map(MetadataValue::unchecked_from_mut_header_value_ref)
}
#[doc(hidden)]
@@ -2338,7 +2338,7 @@ mod as_metadata_key {
}
map.headers
.remove(self.as_str())
.map(&MetadataValue::unchecked_from_header_value)
.map(MetadataValue::unchecked_from_header_value)
}
}
@@ -2353,7 +2353,7 @@ mod as_metadata_key {
}
map.headers
.get(self.as_str())
.map(&MetadataValue::unchecked_from_header_value_ref)
.map(MetadataValue::unchecked_from_header_value_ref)
}
#[doc(hidden)]
@@ -2364,7 +2364,7 @@ mod as_metadata_key {
}
map.headers
.get_mut(self.as_str())
.map(&MetadataValue::unchecked_from_mut_header_value_ref)
.map(MetadataValue::unchecked_from_mut_header_value_ref)
}
#[doc(hidden)]
@@ -2399,7 +2399,7 @@ mod as_metadata_key {
}
map.headers
.remove(self.as_str())
.map(&MetadataValue::unchecked_from_header_value)
.map(MetadataValue::unchecked_from_header_value)
}
}
@@ -2520,7 +2520,7 @@ mod tests {
let mut found_x_word = false;
for key_and_value in map.iter() {
if let KeyAndValueRef::Ascii(ref key, ref _value) = key_and_value {
if let KeyAndValueRef::Ascii(key, _value) = key_and_value {
if key.as_str() == "x-word" {
found_x_word = true;
} else {
@@ -2540,7 +2540,7 @@ mod tests {
let mut found_x_word_bin = false;
for key_and_value in map.iter() {
if let KeyAndValueRef::Binary(ref key, ref _value) = key_and_value {
if let KeyAndValueRef::Binary(key, _value) = key_and_value {
if key.as_str() == "x-word-bin" {
found_x_word_bin = true;
} else {
@@ -2561,7 +2561,7 @@ mod tests {
let mut found_x_word = false;
for key_and_value in map.iter_mut() {
if let KeyAndMutValueRef::Ascii(ref key, ref _value) = key_and_value {
if let KeyAndMutValueRef::Ascii(key, _value) = key_and_value {
if key.as_str() == "x-word" {
found_x_word = true;
} else {
@@ -2581,7 +2581,7 @@ mod tests {
let mut found_x_word_bin = false;
for key_and_value in map.iter_mut() {
if let KeyAndMutValueRef::Binary(ref key, ref _value) = key_and_value {
if let KeyAndMutValueRef::Binary(key, _value) = key_and_value {
if key.as_str() == "x-word-bin" {
found_x_word_bin = true;
} else {
tonic/src/service/interceptor.rs
+1 -1
View File
@@ -349,7 +349,7 @@ mod tests {
Ok::<_, hyper::Error>(hyper::Response::new(hyper::Body::empty()))
});
let svc = InterceptedService::new(svc, |request: crate::Request<()>| Ok(request));
let svc = InterceptedService::new(svc, Ok);
let request = http::Request::builder()
.method(http::Method::OPTIONS)
tonic/src/transport/service/io.rs
+2 -2
View File
@@ -70,7 +70,7 @@ impl AsyncWrite for BoxedIo {
pub(crate) enum ServerIo<IO> {
Io(IO),
#[cfg(feature = "tls")]
TlsIo(TlsStream<IO>),
TlsIo(Box<TlsStream<IO>>),
}
use tower::util::Either;
@@ -89,7 +89,7 @@ impl<IO> ServerIo<IO> {
#[cfg(feature = "tls")]
pub(in crate::transport) fn new_tls_io(io: TlsStream<IO>) -> Self {
Self::TlsIo(io)
Self::TlsIo(Box::new(io))
}
#[cfg(feature = "tls")]