linkerd
/
linkerd2-proxy
mirror of https://github.com/linkerd/linkerd2-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix location of raw pointer comment in `ContextGuard`. (#1027) 

Commit b861a6df317c937123825098a7ef0b50cf52e281 moved the code the
comment was describing, but didn't move the comment.

Signed-off-by: Brian Smith <brian@briansmith.org>
This commit is contained in:
Brian Smith 2018-05-26 18:30:37 -10:00 committed by GitHub
parent 79a38327d2
commit 4ede9a7ef3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
proxy/src/logging.rs
View File

@ -46,12 +46,6 @@ where
T: ::std::fmt::Debug + 'static, T: ::std::fmt::Debug + 'static,
F: FnMut() -> U, F: FnMut() -> U,
{ {
// This is a raw pointer because of lifetime conflicts that require
// the thread local to have a static lifetime.
//
// We don't want to require a static lifetime, and in fact,
// only use the reference within this closure, so converting
// to a raw pointer is safe.
let _guard = ContextGuard::new(context); let _guard = ContextGuard::new(context);
closure() closure()
} }
@ -146,6 +140,12 @@ struct ContextGuard<'a>(&'a (fmt::Debug + 'static));
impl<'a> ContextGuard<'a> { impl<'a> ContextGuard<'a> {
fn new(context: &'a (fmt::Debug + 'static)) -> Self { fn new(context: &'a (fmt::Debug + 'static)) -> Self {
// This is a raw pointer because of lifetime conflicts that require
// the thread local to have a static lifetime.
//
// We don't want to require a static lifetime, and in fact,
// only use the reference within this closure, so converting
// to a raw pointer is safe.
let raw = context as *const fmt::Debug; let raw = context as *const fmt::Debug;
CONTEXT.with(|ctxt| { CONTEXT.with(|ctxt| {
ctxt.borrow_mut().push(raw); ctxt.borrow_mut().push(raw);