Upgrade to rust2018 #122
Merged
Upgrade to rust2018 #122
Conversation
This file contains 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
Amanieu
reviewed
Mar 4, 2019
core/src/parking_lot.rs
Outdated
| @@ -175,14 +168,9 @@ where | |||
| { | |||
| // Try to read from thread-local storage, but return None if the TLS has | |||
| // already been destroyed. | |||
| #[cfg(has_localkey_try_with)] | |||
| fn try_get_tls(key: &'static LocalKey<ThreadData>) -> Option<*const ThreadData> { | |||
| key.try_with(|x| x as *const ThreadData).ok() | |||
| } | |||
There was a problem hiding this comment.
There isn't much point keeping that as a separate function now.
faern
force-pushed
the
upgrade-to-rust2018
branch
2 times, most recently
from
a14f10e to
e889de9
Compare
faern
force-pushed
the
upgrade-to-rust2018
branch
2 times, most recently
from
c395a9e to
c828135
Compare
faern
force-pushed
the
upgrade-to-rust2018
branch
from
c828135 to
d88854d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As we discussed on IRC. Let's upgrade all these three crates to Rust 2018 edition and get rid of some legacy conditional compilation etc.
Will greatly aid the work to integrate it into libstd over at #119