Uh oh!
There was an error while loading. Please reload this page.
Rollup of 5 pull requests - #65797
Closed
Centril wants to merge 17 commits into
Closed
Conversation
This prepares the code base for when projection is interned. Place's projection field is going to be `&List<PlaceElem<'tcx>>` so we won't be able to pattern match against it.
This is so we avoid a massive break of other people's code. Gonna run rustfmt and split the file on a different PR.
It was allocating a new OsString that was immediately dropped after using it with set_file_name. Now it directly changes the extension in the original buffer, without touching the rest of the file name or allocating a temporary string.
Fix the start/end byte positions in the compiler JSON output Track the changes made during normalization in the `SourceFile` and use this information to correct the `start_byte` and `end_byte` fields in the JSON output. This should ensure the start/end byte fields can be used to index the original file, even if Rust normalized the source code for parsing purposes. Both CRLF to LF and BOM removal are handled with this one. The rough plan was discussed with @matklad in rust-lang/rustfix#176 - although I ended up going with `u32` offset tracking so I wouldn't need to deal with `u32 + i32` arithmetics when applying the offset to the span byte positions. Fixesrust-lang#65029
… r=oli-obk Intern place projection This should sit on top of rust-lang#65197. After that one merged, I'm gonna rebase on top of it. The important commits are the last three and there's a bunch of code repetition that I'm going to remove but for that I need to refactor some things that probably need to be added before this PR. Anyway this work helps as is because we can run perf tests :). r? @oli-obk /cc @nikomatsakis
Fix check of `statx` and handle EPERM Should fixrust-lang#65662rust-lang#65662 (comment) > I think a reasonable solution might be to do something like try to stat AT_CWD initially and if that fails with EPERM or ENOSYS we disable the syscall entirely, otherwise it's cached as always good to use. r? @alexcrichton
…ion, r=dtolnay Prevent unnecessary allocation in PathBuf::set_extension. It was allocating a new `OsString` that was immediately dropped after using it with `set_file_name`. Now it directly changes the extension in the original buffer, without touching the rest of the file name or allocating a temporary string.
…-feature, r=Dylan-DPC Fix default "disable-shortcuts" feature value Follow-up of rust-lang#65656 It fixes the bad handling of the default value of the feature (which would disable shortcut by default, which is bad!). r? @Dylan-DPC cc @kinnison
Centril
commented
Oct 25, 2019
ContributorAuthor
@bors r+ p=5 rollup=never |
bors
commented
Oct 25, 2019
Collaborator
📌 Commit 902f940 has been approved by |
bors
commented
Oct 25, 2019
Collaborator
⌛ Testing commit 902f940 with merge 49fa0904a5e76bc2fa52fe2b9777c88ffa171035... |
Centril
commented
Oct 25, 2019
ContributorAuthor
@bors r- retry |
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
7 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:
statxand handle EPERM #65685 (Fix check ofstatxand handle EPERM)Failed merges:
r? @ghost