Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix deprecations on nightly #983

Merged
merged 3 commits into from
Apr 21, 2021
Merged

chore: fix deprecations on nightly #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd0a3e1
remove unused handle time module
hawkw Apr 20, 2021
3d82e9a
remove deprecated compare_and_swap
hawkw Apr 20, 2021
75989a5
update tower; remove deprecated ready-ands
hawkw Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2262,9 +2262,9 @@ dependencies = [

[[package]]
name = "tower"
version = "0.4.5"
version = "0.4.6"
source = "registry+/~https://github.com/rust-lang/crates.io-index"
checksum = "713c629c07a3a97f741c140e474e7304294fabec66a43a33f0832e98315ab07f"
checksum = "f715efe02c0862926eb463e49368d38ddb119383475686178e32e26d15d06a66"
dependencies = [
"futures-core",
"futures-util",
Expand Down
302 changes: 0 additions & 302 deletions linkerd/app/core/src/handle_time.rs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion linkerd/app/core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ pub mod control;
pub mod dns;
pub mod dst;
pub mod errors;
pub mod handle_time;
pub mod http_tracing;
pub mod metrics;
pub mod proxy;
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/outbound/src/http/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ async fn profile_endpoint_propagates_conn_errors() {
});

let rsp = client
.ready_and()
.ready()
.await
.expect("Client must not fail")
.call(
Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/test/src/http_util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ where
{
let (client_io, server_io) = io::duplex(4096);
let f = server
.ready_and()
.ready()
.await
.map_err(Into::into)
.expect("proxy server failed to become ready")
Expand Down Expand Up @@ -108,7 +108,7 @@ pub async fn http_request(
request: Request<Body>,
) -> Response<Body> {
let rsp = client
.ready_and()
.ready()
.await
.expect("Client must not fail")
.call(request)
Expand Down
8 changes: 2 additions & 6 deletions linkerd/app/test/src/resolver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,7 @@ impl<T: Param<ConcreteAddr>, E> tower::Service<T> for Dst<E> {
.unwrap_or_else(|| {
tracing::debug!(?addr, "no endpoint configured for");
// An unknown endpoint was resolved!
self.state
.only
.compare_and_swap(true, false, Ordering::Release);
self.state.only.store(false, Ordering::Release);
let (tx, rx) = mpsc::unbounded_channel();
let _ = tx.send(Ok(Update::DoesNotExist));
UnboundedReceiverStream::new(rx)
Expand Down Expand Up @@ -212,9 +210,7 @@ impl<T: Param<profiles::LookupAddr>> tower::Service<T> for Profiles {
.unwrap_or_else(|| {
tracing::debug!(?addr, "no endpoint configured for");
// An unknown endpoint was resolved!
self.state
.only
.compare_and_swap(true, false, Ordering::Release);
self.state.only.store(false, Ordering::Release);
None
});

Expand Down