Uh oh!
There was an error while loading. Please reload this page.
Rollup of 6 pull requests - #72144
Closed
Dylan-DPC-zz wants to merge 14 commits into
Closed
Conversation
Co-authored-by: Bastian Kauschke <bastian_kauschke@hotmail.de>
Because there is at most one file.
`prefix` should not be mutable. Change the process from for loop to find, which makes the `prefix` able to be immutable.
Fix unused_parens false positive when using binary operations Fixesrust-lang#71290 r? @cuviper who provided instructions
…dows, r=Mark-Simulacrum Fix bootstrap failing on win32 ```powershell python x.py -h # or really any x.py command ``` would fail with ``` info: Downloading and building bootstrap before processing --help command. See src/bootstrap/README.md for help with common commands. Updating only changed submodules Submodules updated in 0.15 seconds Traceback (most recent call last): File "x.py", line 11, in <module> bootstrap.main() File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 960, in main bootstrap(help_triggered) File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 925, in bootstrap build.build = args.build or build.build_triple() File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 731, in build_triple return default_build_triple() File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 184, in default_build_triple ostype = require(["uname", "-s"], exit=required).decode(default_encoding) AttributeError: 'NoneType' object has no attribute 'decode' ``` This PR defers the `decode` call until after we're sure `ostype` and `cputype` are not `None`, as they would be on Windows since `uname` doesn't exist
…d_files, r=alexcrichton Change `WorkProduct::saved_files` to an `Option`. Because there is at most one file. r? @bjorn3
…hewjasper Add doc comment for `rustc_middle::mir::mono::Linkage`
Dylan-DPC-zz
commented
May 12, 2020
Author
@bors r+ p=6 rollup=never |
bors
commented
May 12, 2020
Collaborator
📌 Commit 5d5eeee has been approved by |
bors
commented
May 12, 2020
Collaborator
⌛ Testing commit 5d5eeee with merge f44e75dc2e5ed4c5992fe79804798b8b69d885c7... |
bors
commented
May 12, 2020
Collaborator
💔 Test failed - checks-actions |
Dylan-DPC-zz
commented
May 12, 2020
Author
@bors retry |
bors
commented
May 12, 2020
Collaborator
⌛ Testing commit 5d5eeee with merge c82c48a5570517799d56e3d6c5da40a15e12a57d... |
bors
commented
May 13, 2020
Collaborator
💔 Test failed - checks-actions |
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
9 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:
prefixshould not be mutable. #71525 (prefixshould not be mutable.)WorkProduct::saved_filesto anOption. #72126 (ChangeWorkProduct::saved_filesto anOption.)rustc_middle::mir::mono::Linkage#72138 (Add doc comment forrustc_middle::mir::mono::Linkage)Failed merges:
r? @ghost