Skip to content

Conversation

camelid
Copy link
Member

@camelid camelid commented Jun 24, 2023

The old code actually replaced .json with .bak (so, settings.bak),
rather than appending .bak as claimed (settings.json.bak).

Path::set_extension can instead be used with dots:

The new extension may contain dots and will be used in its entirety,
but only the part after the final dot will be reflected in
self.extension.

r? @jyn514

The old code actually replaced `.json` with `.bak` (so, `settings.bak`),
rather than appending `.bak` as claimed (`settings.json.bak`).

`Path::set_extension` can instead be used with dots:

> The new extension may contain dots and will be used in its entirety,
> but only the part after the final dot will be reflected in
> self.extension.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 24, 2023
@jyn514
Copy link
Member

jyn514 commented Jun 24, 2023

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 24, 2023

📌 Commit ce32691 has been approved by jyn514

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 24, 2023
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 24, 2023
…jyn514

bootstrap: Backup `settings.json` to the correct filename

The old code actually replaced `.json` with `.bak` (so, `settings.bak`),
rather than appending `.bak` as claimed (`settings.json.bak`).

`Path::set_extension` can instead be used with dots:

> The new extension may contain dots and will be used in its entirety,
> but only the part after the final dot will be reflected in
> `self.extension`.

r? `@jyn514`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 24, 2023
…llaumeGomez

Rollup of 8 pull requests

Successful merges:

 - rust-lang#112703 ([-Ztrait-solver=next, mir-typeck] instantiate hidden types in the root universe)
 - rust-lang#112854 (fix: add cfg diagnostic for unresolved import error)
 - rust-lang#112912 (style-guide: Rewrite let-else section for clarity, without changing formatting)
 - rust-lang#112915 (Update runtests.py : grammar correction)
 - rust-lang#112971 (issue template: add clippy entry which points to the clippy repo)
 - rust-lang#112989 (Add a regression test for rust-lang#109141)
 - rust-lang#113002 (bootstrap: Backup `settings.json` to the correct filename)
 - rust-lang#113003 (Fix old python deprecation check in x.py)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6b33768 into rust-lang:master Jun 24, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 24, 2023
@camelid camelid deleted the bootstrap-settings.bak branch June 24, 2023 23:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants