From b86ec3ac4d6831d7d7480a19bf75b1826034a630 Mon Sep 17 00:00:00 2001
From: Oliver Gould <ver@buoyant.io>
Date: Fri, 3 Nov 2023 03:50:33 +0000
Subject: [PATCH] fixup nightly build

---
 Cargo.lock                              | 4 ++--
 linkerd/app/inbound/src/http/server.rs  | 5 +----
 linkerd/app/inbound/src/policy/store.rs | 4 +---
 linkerd/app/integration/src/lib.rs      | 1 -
 linkerd/app/outbound/src/protocol.rs    | 1 -
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 181af59aa4..9e01084ed6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2214,9 +2214,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.52"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
diff --git a/linkerd/app/inbound/src/http/server.rs b/linkerd/app/inbound/src/http/server.rs
index c9d6e169d5..e6dc265f9d 100644
--- a/linkerd/app/inbound/src/http/server.rs
+++ b/linkerd/app/inbound/src/http/server.rs
@@ -1,9 +1,6 @@
 use super::set_identity_header::NewSetIdentityHeader;
 use crate::{policy, Inbound};
-pub use linkerd_app_core::proxy::http::{
-    normalize_uri, strip_header, uri, BoxBody, BoxResponse, DetectHttp, Request, Response, Retain,
-    Version,
-};
+pub use linkerd_app_core::proxy::http::{normalize_uri, Version};
 use linkerd_app_core::{
     config::{ProxyConfig, ServerConfig},
     errors, http_tracing, io,
diff --git a/linkerd/app/inbound/src/policy/store.rs b/linkerd/app/inbound/src/policy/store.rs
index 13ed367d7f..50bc155133 100644
--- a/linkerd/app/inbound/src/policy/store.rs
+++ b/linkerd/app/inbound/src/policy/store.rs
@@ -1,9 +1,7 @@
 use super::{api, AllowPolicy, DefaultPolicy, GetPolicy};
 use linkerd_app_core::{proxy::http, transport::OrigDstAddr, Error};
 use linkerd_idle_cache::IdleCache;
-pub use linkerd_proxy_server_policy::{
-    authz::Suffix, Authentication, Authorization, Protocol, ServerPolicy,
-};
+pub use linkerd_proxy_server_policy::{Protocol, ServerPolicy};
 use rangemap::RangeInclusiveSet;
 use std::{
     collections::HashSet,
diff --git a/linkerd/app/integration/src/lib.rs b/linkerd/app/integration/src/lib.rs
index 6745f92712..7698ed6c0f 100644
--- a/linkerd/app/integration/src/lib.rs
+++ b/linkerd/app/integration/src/lib.rs
@@ -47,7 +47,6 @@ use tokio::net::TcpListener;
 pub use tokio::sync::oneshot;
 pub use tonic as grpc;
 pub use tower::Service;
-pub use tracing::*;
 
 /// Environment variable for overriding the test patience.
 pub const ENV_TEST_PATIENCE_MS: &str = "RUST_TEST_PATIENCE_MS";
diff --git a/linkerd/app/outbound/src/protocol.rs b/linkerd/app/outbound/src/protocol.rs
index bc83276bdf..1550baf168 100644
--- a/linkerd/app/outbound/src/protocol.rs
+++ b/linkerd/app/outbound/src/protocol.rs
@@ -1,5 +1,4 @@
 use crate::{http, Outbound};
-pub use linkerd_app_core::proxy::api_resolve::ConcreteAddr;
 use linkerd_app_core::{detect, io, svc, Error, Infallible};
 use std::{fmt::Debug, hash::Hash};