Auto merge of #5239 - alexcrichton:remove-scoped-tls, r=matklad
authorbors <bors@rust-lang.org>
Sat, 24 Mar 2018 19:54:49 +0000 (19:54 +0000)
committerbors <bors@rust-lang.org>
Sat, 24 Mar 2018 19:54:49 +0000 (19:54 +0000)
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


Trivial merge