Skip to content

Commit

Permalink
chore(tonic): Deprecate API when they only return None
Browse files Browse the repository at this point in the history
  • Loading branch information
tottoto committed Sep 14, 2023
1 parent 6af8d5c commit 86a7dce
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 0 deletions.
21 changes: 21 additions & 0 deletions tonic/src/request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,13 @@ impl<T> Request<T> {
/// This will return `None` if the `IO` type used
/// does not implement `Connected` or when using a unix domain socket.
/// This currently only works on the server side.
#[cfg_attr(
not(feature = "transport"),
deprecated(
since = "0.10.1",
note = "`remote_addr` only returns `None` without transport feature. This API will require transport feature.",
)
)]
pub fn local_addr(&self) -> Option<SocketAddr> {
#[cfg(feature = "transport")]
{
Expand Down Expand Up @@ -241,6 +248,13 @@ impl<T> Request<T> {
/// This will return `None` if the `IO` type used
/// does not implement `Connected` or when using a unix domain socket.
/// This currently only works on the server side.
#[cfg_attr(
not(feature = "transport"),
deprecated(
since = "0.10.1",
note = "`remote_addr` only returns `None` without transport feature. This API will require transport feature.",
)
)]
pub fn remote_addr(&self) -> Option<SocketAddr> {
#[cfg(feature = "transport")]
{
Expand Down Expand Up @@ -277,6 +291,13 @@ impl<T> Request<T> {
/// `Some` on the server side of the `transport` server with
/// TLS enabled connections.
#[cfg(feature = "transport")]
#[cfg_attr(
all(feature = "transport", not(feature = "tls")),
deprecated(
since = "0.10.1",
note = "`peer_certs` only returns `None` without tls feature. This API will require tls feature.",
)
)]
#[cfg_attr(docsrs, doc(cfg(feature = "transport")))]
pub fn peer_certs(&self) -> Option<Arc<Vec<Certificate>>> {

Check failure on line 302 in tonic/src/request.rs

View workflow job for this annotation

GitHub Actions / check (ubuntu-latest)

use of deprecated struct `transport::tls::Certificate`: `Certificate` is used only by deprecated API without tls feature.

Check failure on line 302 in tonic/src/request.rs

View workflow job for this annotation

GitHub Actions / check (macOS-latest)

use of deprecated struct `transport::tls::Certificate`: `Certificate` is used only by deprecated API without tls feature.

Check failure on line 302 in tonic/src/request.rs

View workflow job for this annotation

GitHub Actions / Check MSRV

use of deprecated struct `transport::tls::Certificate`: `Certificate` is used only by deprecated API without tls feature.
#[cfg(feature = "tls")]
Expand Down
21 changes: 21 additions & 0 deletions tonic/src/transport/tls.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
/// Represents a X509 certificate.
#[cfg_attr(
not(feature = "tls"),
deprecated(
since = "0.10.1",
note = "`Certificate` is used only by deprecated API without tls feature.",
)
)]
#[derive(Debug, Clone)]
pub struct Certificate {
pub(crate) pem: Vec<u8>,
Expand All @@ -13,6 +20,13 @@ pub struct Identity {
pub(crate) key: Vec<u8>,
}

#[cfg_attr(
not(feature = "tls"),
deprecated(
since = "0.10.1",
note = "`Certificate` is used only by deprecated API without tls feature.",
)
)]
impl Certificate {

Check failure on line 30 in tonic/src/transport/tls.rs

View workflow job for this annotation

GitHub Actions / check (ubuntu-latest)

use of deprecated struct `transport::tls::Certificate`: `Certificate` is used only by deprecated API without tls feature.

Check failure on line 30 in tonic/src/transport/tls.rs

View workflow job for this annotation

GitHub Actions / check (macOS-latest)

use of deprecated struct `transport::tls::Certificate`: `Certificate` is used only by deprecated API without tls feature.

Check failure on line 30 in tonic/src/transport/tls.rs

View workflow job for this annotation

GitHub Actions / Check MSRV

use of deprecated struct `transport::tls::Certificate`: `Certificate` is used only by deprecated API without tls feature.
/// Parse a PEM encoded X509 Certificate.
///
Expand All @@ -38,6 +52,13 @@ impl Certificate {
}
}

#[cfg_attr(
not(feature = "tls"),
deprecated(

Check failure on line 57 in tonic/src/transport/tls.rs

View workflow job for this annotation

GitHub Actions / check (ubuntu-latest)

this `#[deprecated]` annotation has no effect

Check failure on line 57 in tonic/src/transport/tls.rs

View workflow job for this annotation

GitHub Actions / check (macOS-latest)

this `#[deprecated]` annotation has no effect

Check failure on line 57 in tonic/src/transport/tls.rs

View workflow job for this annotation

GitHub Actions / Check MSRV

this `#[deprecated]` annotation has no effect
since = "0.10.1",
note = "`Certificate` is used only by deprecated API without tls feature.",
)
)]
impl AsRef<[u8]> for Certificate {

Check failure on line 62 in tonic/src/transport/tls.rs

View workflow job for this annotation

GitHub Actions / check (ubuntu-latest)

use of deprecated struct `transport::tls::Certificate`: `Certificate` is used only by deprecated API without tls feature.

Check failure on line 62 in tonic/src/transport/tls.rs

View workflow job for this annotation

GitHub Actions / check (macOS-latest)

use of deprecated struct `transport::tls::Certificate`: `Certificate` is used only by deprecated API without tls feature.

Check failure on line 62 in tonic/src/transport/tls.rs

View workflow job for this annotation

GitHub Actions / Check MSRV

use of deprecated struct `transport::tls::Certificate`: `Certificate` is used only by deprecated API without tls feature.
fn as_ref(&self) -> &[u8] {
self.pem.as_ref()
Expand Down

0 comments on commit 86a7dce

Please sign in to comment.