Conversation
Much of this repo was moved to Rust 2018 in 1d4eac..011c00. This change updates the primary proxy project. More information about Rust 2018 can be found at https://doc.rust-lang.org/stable/edition-guide/rust-2018/edition-changes.html
kleimkuhler
reviewed
Aug 8, 2019
Contributor
kleimkuhler
left a comment
There was a problem hiding this comment.
Just a heads up I had to make the following changes to get this to build:
diff --git a/src/telemetry/process.rs b/src/telemetry/process.rs
index e3c8bdd..dcbc69e 100644
--- a/src/telemetry/process.rs
+++ b/src/telemetry/process.rs
@@ -2,7 +2,7 @@ use self::system::System;
use linkerd2_metrics::{metrics, FmtMetrics, Gauge};
use std::fmt;
use std::time::{SystemTime, UNIX_EPOCH};
-use tracing::{debug, error, warn};
+use tracing::debug;
metrics! {
process_start_time_seconds: Gauge {
@@ -169,7 +169,7 @@ mod system {
mod system {
use std::{fmt, io};
- use super::super::metrics::FmtMetrics;
+ use super::FmtMetrics;
#[derive(Clone, Debug)]
pub(super) struct System {}
diff --git a/src/transport/addr_info.rs b/src/transport/addr_info.rs
index a20e69e..274b732 100644
--- a/src/transport/addr_info.rs
+++ b/src/transport/addr_info.rs
@@ -2,7 +2,7 @@ use std::fmt::Debug;
use std::io;
use std::net::SocketAddr;
use tokio::net::TcpStream;
-use tracing::trace;
+use tracing::{debug, trace};
pub trait AddrInfo: Debug {
fn local_addr(&self) -> Result<SocketAddr, io::Error>;
hawkw
reviewed
Aug 8, 2019
Contributor
hawkw
left a comment
There was a problem hiding this comment.
I'm fine with this change. Commented on some possible style nits that don't actually matter to me.
Member
Author
|
@kleimkuhler thanks, i had only tested compiling on linux. should work on macos now, as well. |
hawkw
approved these changes
Aug 8, 2019
olix0r
added a commit
to linkerd/linkerd2
that referenced
this pull request
Aug 9, 2019
* Update h2 to v0.1.26 * Properly fall back in the dst_router (linkerd/linkerd2-proxy#291) * Tap server authorizes clients when identity is expected (linkerd/linkerd2-proxy#290) * update-rust-version: Check usage (linkerd/linkerd2-proxy#298) * tap: fix tap response streams never ending (linkerd/linkerd2-proxy#299) * Require identity on tap requests (linkerd/linkerd2-proxy#295) * Authority label should reflect logical dst (linkerd/linkerd2-proxy#300) * Replace futures_watch with tokio::sync::watch (linkerd/linkerd2-proxy#301) * metrics: add `request_handle_us` histogram (linkerd/linkerd2-proxy#294) * linkerd2-proxy: Adopt Rust 2018 (linkerd/linkerd2-proxy#302) * Remove futures-mpsc-lossy (linkerd/linkerd2-proxy#305) * Adopt std::convert::TryFrom (linkerd/linkerd2-proxy#304) * lib: Rename directories to match crate names (linkerd/linkerd2-proxy#303)
olix0r
added a commit
to linkerd/linkerd2
that referenced
this pull request
Aug 9, 2019
* update-rust-version: Check usage (linkerd/linkerd2-proxy#298) * tap: fix tap response streams never ending (linkerd/linkerd2-proxy#299) * Require identity on tap requests (linkerd/linkerd2-proxy#295) * Authority label should reflect logical dst (linkerd/linkerd2-proxy#300) * Replace futures_watch with tokio::sync::watch (linkerd/linkerd2-proxy#301) * metrics: add `request_handle_us` histogram (linkerd/linkerd2-proxy#294) * linkerd2-proxy: Adopt Rust 2018 (linkerd/linkerd2-proxy#302) * Remove futures-mpsc-lossy (linkerd/linkerd2-proxy#305) * Adopt std::convert::TryFrom (linkerd/linkerd2-proxy#304) * lib: Rename directories to match crate names (linkerd/linkerd2-proxy#303)
olix0r
added a commit
to linkerd/linkerd2
that referenced
this pull request
Aug 9, 2019
* update-rust-version: Check usage (linkerd/linkerd2-proxy#298) * tap: fix tap response streams never ending (linkerd/linkerd2-proxy#299) * Require identity on tap requests (linkerd/linkerd2-proxy#295) * Authority label should reflect logical dst (linkerd/linkerd2-proxy#300) * Replace futures_watch with tokio::sync::watch (linkerd/linkerd2-proxy#301) * metrics: add `request_handle_us` histogram (linkerd/linkerd2-proxy#294) * linkerd2-proxy: Adopt Rust 2018 (linkerd/linkerd2-proxy#302) * Remove futures-mpsc-lossy (linkerd/linkerd2-proxy#305) * Adopt std::convert::TryFrom (linkerd/linkerd2-proxy#304) * lib: Rename directories to match crate names (linkerd/linkerd2-proxy#303)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Much of this repo was moved to Rust 2018 in 1d4eac..011c00. This
change updates the primary proxy project.
More information about Rust 2018 can be found at
https://doc.rust-lang.org/stable/edition-guide/rust-2018/edition-changes.html
While pursuing this change, I've tried to consolidate
usestatements into asingle block at the beginning of each module. This will help to make modules
more uniform.
There are no functional changes.