Fix a bug in x.py fmt that prevents some files being formatted.#94582
Merged
bors merged 1 commit intorust-lang:masterfrom Mar 4, 2022
Merged
Fix a bug in x.py fmt that prevents some files being formatted.#94582bors merged 1 commit intorust-lang:masterfrom
x.py fmt that prevents some files being formatted.#94582bors merged 1 commit intorust-lang:masterfrom
Conversation
If you have a file in the repository root with the same name as a file somewhere within a directory, the latter currently won't get formatted. I have experienced this multiple times and not understood what was happening; I finally figured out the problem today. This commit fixes the problem.
Contributor
Author
|
I hit this exact problem yesterday here: #94547 (comment) |
Member
|
@bors r+ rollup Probably a nice speed up, too. |
Collaborator
|
📌 Commit fc142eb has been approved by |
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 4, 2022
…imulacrum Fix a bug in `x.py fmt` that prevents some files being formatted. If you have a file in the repository root with the same name as a file somewhere within a directory, the latter currently won't get formatted. I have experienced this multiple times and not understood what was happening; I finally figured out the problem today. This commit fixes the problem. r? `@Mark-Simulacrum`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 4, 2022
Rollup of 10 pull requests Successful merges: - rust-lang#88805 (Clarification of default socket flags) - rust-lang#93418 (rustdoc & doc: no `shortcut` for `rel="icon"`) - rust-lang#93913 (Remove the everybody loops pass) - rust-lang#93965 (Make regular stdio lock() return 'static handles) - rust-lang#94339 (ARM: Only allow using d16-d31 with asm! when supported by the target) - rust-lang#94404 (Make Ord and PartialOrd opt-out in `newtype_index`) - rust-lang#94466 (bootstrap: correct reading of flags for llvm) - rust-lang#94572 (Use `HandleOrNull` and `HandleOrInvalid` in the Windows FFI bindings.) - rust-lang#94575 (CTFE SwitchInt: update comment) - rust-lang#94582 (Fix a bug in `x.py fmt` that prevents some files being formatted.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
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.
If you have a file in the repository root with the same name as a file
somewhere within a directory, the latter currently won't get formatted.
I have experienced this multiple times and not understood what was
happening; I finally figured out the problem today. This commit fixes
the problem.
r? @Mark-Simulacrum