Rollup of 5 pull requests #27383
Merged
Rollup of 5 pull requests #27383
Conversation
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
Member
Manishearth
commented
Jul 29, 2015
Manishearth
commented
- Successful merges: Error message for E0307 is weird #26485 #26778, Added entries to explain expression-oriented languages #27232, Replace occurences of illegal in user facing docs and explanations #27352, std: Remove some old #[cfg(test) hacks #27369, std: Fix sub-second Condvar::wait_timeout_ms #27373
- Failed merges:
Added definitions for 'Expression', 'Expression-Oriented Language' and 'Statement'. Sorted the definitions alphabetically.
Added the fact that expression statements can form part of larger expressions.
Tidied up glossary.md and added link from hello-world.md to 'expression-oriented language' in glossary.md
Since most lang items are actually defined in core, these hack reexports don't actually do anything useful.
The API we're calling requires us to pass an absolute point in time as an argument (`pthread_cond_timedwait`) so we call `gettimeofday` ahead of time to then add the specified duration to. Unfortuantely the current "add the duration" logic forgot to take into account the current time's sub-second precision (e.g. the `tv_usec` field was ignored), causing sub-second duration waits to return spuriously.
Print the error message and then what is expected by the repeat count so the output makes more sense when there is an error in the const expression
Added definitions for 'Expression', 'Expression-Oriented Language' and 'Statement' to glossary. Sorted the definitions alphabetically. r? @steveklabnik
Since most lang items are actually defined in core, these hack reexports don't actually do anything useful.
…=brson The API we're calling requires us to pass an absolute point in time as an argument (`pthread_cond_timedwait`) so we call `gettimeofday` ahead of time to then add the specified duration to. Unfortuantely the current "add the duration" logic forgot to take into account the current time's sub-second precision (e.g. the `tv_usec` field was ignored), causing sub-second duration waits to return spuriously.
|
@bors r+ p=5 |
|
📌 Commit b904b45 has been approved by |
|
⌛ Testing commit b904b45 with merge 1867078... |
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.