Rollup of 6 pull requests#91995
Closed
matthiaskrgr wants to merge 12 commits intorust-lang:masterfrom
Closed
Conversation
const_manually_drop was stabilized in 1.32 as mentioned in https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1320-2019-01-17
DF_ORIGIN flag signifies that the object being loaded may make reference to the $ORIGIN substitution string. Some implementations are just ignoring DF_ORIGIN and do substitution for $ORIGIN if present (whatever DF_ORIGIN presence or not) like glibc. But some others mandate the present of DF_ORIGIN for the substitution (like OpenBSD). Set the flag inconditionally if rpath is wanted.
…rochenkov Warn when a `#[test]`-like built-in attribute macro is present multiple times. Fixes rust-lang#90979.
…rop-since, r=kennytm Fix since attribute for const_manually_drop feature const_manually_drop was stabilized in 1.32 as mentioned in https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1320-2019-01-17
pass -Wl,-z,origin to set DF_ORIGIN when using rpath DF_ORIGIN flag signifies that the object being loaded may make reference to the $ORIGIN substitution string. Some implementations are just ignoring [DF_ORIGIN](http://www.sco.com/developers/gabi/latest/ch5.dynamic.html#df_flags) and do [substitution](http://www.sco.com/developers/gabi/latest/ch5.dynamic.html#substitution) for $ORIGIN if present (whatever DF_ORIGIN presence or not) like glibc. But some others mandate the present of DF_ORIGIN for the substitution (like OpenBSD). Set the flag inconditionally if rpath is wanted. One possible fallout is if the linker rejects `-z origin` option.
…wiser Remove `in_band_lifetimes` from `rustc_borrowck` See rust-lang#91867 for more information.
…riplett Add `io::Error::other` This PR adds a small utility constructor, `io::Error::other`, a shorthand for `io::Error::new(io::ErrorKind::Other, err)`, something I find myself writing often. For some concrete stats, a quick search on [grep.app](https://grep.app) shows that more than half of the uses of `io::Error::new` use `ErrorKind::Other`: ``` Error::new\((?:std::)?(?:io::)?ErrorKind:: => 3,898 results Error::new\((?:std::)?(?:io::)?ErrorKind::Other => 2,186 results ```
Pull in libdevstat on FreeBSD Similar to rust-lang#90495, spotted in rust-lang#91909.
rustbot
added
T-compiler
Member
Author
|
@bors r+ rollup=never p=6 |
Collaborator
|
📌 Commit ff3dd19 has been approved by |
bors
added
the
S-waiting-on-bors
Collaborator
|
⌛ Testing commit ff3dd19 with merge dec4fe07f92bfee950bf15b5840ce8253840db64... |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Collaborator
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
Member
Author
bors
added
S-waiting-on-bors
Collaborator
|
⌛ Testing commit ff3dd19 with merge b0b13cd245fb2254c205e206d8031869821b382d... |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Collaborator
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
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.
Successful merges:
#[test]-like built-in attribute macro is present multiple times. #91172 (Warn when a#[test]-like built-in attribute macro is present multiple times.)in_band_lifetimesfromrustc_borrowck#91879 (Removein_band_lifetimesfromrustc_borrowck)io::Error::other#91947 (Addio::Error::other)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup