Rollup of 6 pull requests #36274
Merged
Rollup of 6 pull requests #36274
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
…--enable-local-rebuild When using --enable-local-rebuild configure options, the configure script will test rustc version. But when running it, it will not use the libraries in the local-rust-root directory. So use `LD_LIBRARY_PATH` environment variable to correct it.
This feature was accidentally removed in rust-lang#35957.
|
@bors r+ p=10 |
|
📌 Commit 214313a has been approved by |
|
r? @Aatch (rust_highfive has picked a reviewer for you, use r? to override) |
|
⌛ Testing commit 214313a with merge b682d7b... |
|
💔 Test failed - auto-mac-64-opt-rustbuild |
|
@bors-servo retry force |
…umeGomez Indicate where `core::result::IntoIter` is created. None
…handturner E0060 and E0061 improvement Fixes rust-lang#35290. r? @jonathandturner
…Gomez Update E0496 to new format Fixes rust-lang#36000. Part of rust-lang#35233. r? @GuillaumeGomez
Use libraries from local-rust-root directory in configure when using … …--enable-local-rebuild When using --enable-local-rebuild configure options, the configure script will test rustc version. But when running it, it will not use the libraries in the local-rust-root directory. So use `LD_LIBRARY_PATH` environment variable to correct it. Under OpenBSD, we use `--enable-local-rebuild` for rebuilding rustc-1.11.0 using rustc-1.11.0. But as it is in use in -current (the developpment branch of OpenBSD), system libraries could easily have ABI/API changes. The (unofficial) bootstrap (rustc-1.11.0 used for building rustc-1.11.0) include several system libraries to permit it to run. The build system use libraries in stage0/lib directory. But the configure script doesn't. Due to my special use of `--enable-local-rebuild`, I dunno if this PR is suitable for inclusion. But it corrects a difference between build and configure use of the binary. r? @alexcrichton
…rielb1 Add back feature accidentally removed This feature was accidentally removed in rust-lang#35957.
|
FYI, I don't think bors sees this PR. |
|
I think this needs an r+ since new / updated commits were pushed. |
|
@bors r+ |
|
📌 Commit 20ec61e has been approved by |
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.
core::result::IntoIteris created. #35845, E0060 and E0061 improvement #35983, Update E0496 to new format #36065, Rustc metadata diagnostics #36102, Use libraries from local-rust-root directory in configure when using … #36242, Add back feature accidentally removed #36245