Rollup of 5 pull requests #45192
Merged
Rollup of 5 pull requests #45192
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
Member
steveklabnik
commented
Oct 11, 2017
steveklabnik
commented
- Successful merges: Implement display_hint in gdb pretty printers #45071, incr.comp.: Add some documentation to force_from_dep_node(). #45139, Update let-expressions.rs with DepNode labels #45148, Fix a mistake in release notes for 1.21.0 #45171, Fix path to x.py in bootstrap/configure.py script #45180
- Failed merges: Fix PEP8 style issues in bootstrap code #45121
A few pretty-printers were returning a quoted string from their to_string method. It's preferable in gdb to return a lazy string and to let gdb handle the display by having a "display_hint" method that returns "string" -- it lets gdb settings (like "set print ...") work, it handles corrupted strings a bit better, and it passes the information along to IDEs.
Also reorder changes to put the important one first.
We may see a help message in the end of the output of the ./configure script: $ ./configure configure: processing command line configure: configure: build.configure-args := [] configure: configure: writing `config.toml` in current directory configure: configure: run `python ./src/bootstrap/x.py --help` configure: but the x.py script is actually in the rust root directory and executing of such help string will give us error: $ python ./src/bootstrap/x.py --help python: can't open file './src/bootstrap/x.py': [Errno 2] No such file or directory This patch fixes path to the x.py script in the output of the ./configure
…elwoerister Implement display_hint in gdb pretty printers A few pretty-printers were returning a quoted string from their to_string method. It's preferable in gdb to return a lazy string and to let gdb handle the display by having a "display_hint" method that returns "string" -- it lets gdb settings (like "set print ...") work, it handles corrupted strings a bit better, and it passes the information along to IDEs.
…m_dep_node, r=nikomatsakis incr.comp.: Add some documentation to force_from_dep_node(). r? @nikomatsakis
Update let-expressions.rs with DepNode labels As a part of rust-lang#44924, the PR has tests verified for the following dependency nodes for **let-expressions** ``` - MirValidated - MirOptimized - TypeCheckTables - TypeOfItem - GenericsOfItem - PredicatesOfItem - FnSignature ``` As we are more concerned with the function body, the following fingerprints do not change over compilation sessions. ```- TypeOfItem - GenericsOfItem - PredicatesOfItem - FnSignature ``` r? @nikomatsakis cc @michaelwoerister P.S. Will add more tests as and when possible :)
…teveklabnik Fix a mistake in release notes for 1.21.0 Also reorder changes to put the important one first.
…py, r=Mark-Simulacrum Fix path to x.py in bootstrap/configure.py script We may see a help message in the end of the output of the ./configure script: ``` $ ./configure configure: processing command line configure: configure: build.configure-args := [] configure: configure: writing `config.toml` in current directory configure: configure: run `python ./src/bootstrap/x.py --help` configure: ``` but the `x.py` script is actually in the rust root directory and executing of such help string will give us error: ``` $ python ./src/bootstrap/x.py --help python: can't open file './src/bootstrap/x.py': [Errno 2] No such file or directory ``` This patch fixes path to the x.py script in the output of the ./configure
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1 |
|
📌 Commit 4a90366 has been approved by |
|
⌛ Testing commit 4a90366 with merge 01e08b6b737f5b251874f3707baad22f25a498a9... |
|
💔 Test failed - status-travis |
|
@bors: retry |
|
⌛ Testing commit 4a90366 with merge 8f83b802c789996a17eaef3715eaab241947ca11... |
|
💔 Test failed - status-travis |
|
@bors retry
|
|
⌛ Testing commit 4a90366 with merge c05241b7b9c43ffb82f57e3c8dc318f672c8e330... |
|
💔 Test failed - status-travis |
|
@bors retry
|
|
☀️ Test successful - status-appveyor, status-travis |
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.