From: bors <bors@rust-lang.org>
Date: Sat, 24 Mar 2018 19:54:49 +0000 (+0000)
Subject: Auto merge of #5239 - alexcrichton:remove-scoped-tls, r=matklad
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d4bd5885813d947b4bf9e4f552525359537dd2e4;p=cargo.git

Auto merge of #5239 - alexcrichton:remove-scoped-tls, r=matklad

Remove scoped_tls dependency

This is causing [conflicts] with rebuilding upstream in rust-lang/rust, so
remove this for now until we figure out a better solution.

[conflicts]: https://github.com/rust-lang/rust/pull/49053#issuecomment-375906970
---

d4bd5885813d947b4bf9e4f552525359537dd2e4