Skip to content

Conversation

wangkirin
Copy link
Contributor

in #88362 , the stage0.txt have been switched to stage0.json , but in config.toml.example the guide didn't change , this PR fix this issue

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 13, 2021
@jyn514
Copy link
Member

jyn514 commented Oct 13, 2021

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 13, 2021

📌 Commit 4b4d3ee has been approved by jyn514

@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 Oct 13, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 13, 2021
Rollup of 12 pull requests

Successful merges:

 - rust-lang#89768 (add some more testcases)
 - rust-lang#89777 (Edit explanation of test for nested type ascriptions)
 - rust-lang#89781 (Add missing words in `Infallible` docs)
 - rust-lang#89782 (Improve CJK font in rustdoc)
 - rust-lang#89794 (Add #[must_use] to to_value conversions)
 - rust-lang#89814 (Fix uppercase/lowercase error)
 - rust-lang#89816 (Fix invalid rules in .gitignore)
 - rust-lang#89817 (Add #[inline] to int log10 functions.)
 - rust-lang#89818 (Use Option::map_or instead of open coding it)
 - rust-lang#89828 (Fix config.toml overflow-checks options)
 - rust-lang#89840 (fix the stage0 tools config file path in `config.toml.example`)
 - rust-lang#89845 (Add davidtwco to the `.mailmap`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d01cfe1 into rust-lang:master Oct 13, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 13, 2021
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants