diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-09-11 20:04:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-11 20:04:24 +0200 |
| commit | ff4b3d4780f4961297a223673e88dd73e504b25c (patch) | |
| tree | f583dad990155c9f0adaf54b638a7550dc231e36 /compiler/rustc_codegen_llvm/src/allocator.rs | |
| parent | 5107ff43229b3e0f3c9ebcc3796c90e3497598cb (diff) | |
| parent | 5f327176492e3ef66d8140fb771d77bc2b5eebac (diff) | |
| download | rust-ff4b3d4780f4961297a223673e88dd73e504b25c.tar.gz rust-ff4b3d4780f4961297a223673e88dd73e504b25c.zip | |
Rollup merge of #130161 - onur-ozkan:fmt-changed-files, r=Kobzol,RalfJung
refactor merge base logic and fix `x fmt` When remote upstream is not configured, using [get_git_modified_files](https://github.com/rust-lang/rust/blob/38e3a5771cefc9362976a605549f8b04d5707311/src/tools/build_helper/src/git.rs#L114) to find modified files fails because [get_rust_lang_rust_remote](https://github.com/rust-lang/rust/blob/38e3a5771cefc9362976a605549f8b04d5707311/src/tools/build_helper/src/git.rs#L46-L48) can not resolve "rust-lang/rust" from the git output. The changes in this PR makes bootstrap to find the latest bors commit, treating it as the "closest upstream commit" so that the change tracker logic can use it to find the diffs. In addition, [skips formatting](https://github.com/rust-lang/rust/commit/e3924544832668a6e239153a90d3be2077fbdce4) if there are no modified files. Fixes #130147
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/allocator.rs')
0 files changed, 0 insertions, 0 deletions