Conversation
|
(rust-highfive has picked a reviewer for you, use r? to override) |
|
oh dear I never know what to do with diffs like that .... @bors: r= |
|
📌 Commit 9a71c179769b9a4a836bbabec66b43c761c59596 has been approved by `` |
|
@bors: r+ |
|
📌 Commit 9a71c179769b9a4a836bbabec66b43c761c59596 has been approved by |
|
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message |
|
☔ The latest upstream changes (presumably #9750) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@bors r=alexcrichton |
|
📌 Commit 70a607e has been approved by |
|
☀️ Test successful - checks-actions |
Update cargo 11 commits in d21c22870e58499d6c31f1bef3bf1255eb021666..cc17afbb0067b1f57d8882640f63b2168d5b7624 2021-07-26 20:23:21 +0000 to 2021-08-02 20:28:08 +0000 - Stabilize the rust-version field (rust-lang/cargo#9732) - Remove nbsp characters. (rust-lang/cargo#9751) - Update unstable documentation TOC. (rust-lang/cargo#9750) - Some minor updates for package/publish package selection. (rust-lang/cargo#9749) - Bump to 0.57.0, update changelog (rust-lang/cargo#9748) - Stabilize `[env]` sections (rust-lang/cargo#9411) - doc: Clarify [doc].browser docs, document PathAndArgs better (rust-lang/cargo#9747) - Bump cargo-util version. (rust-lang/cargo#9745) - Make clippy happy (rust-lang/cargo#9736) - Fix typo in features doc (rust-lang/cargo#9737) - doc test supports silent output (rust-lang/cargo#9730)
Update cargo 11 commits in d21c22870e58499d6c31f1bef3bf1255eb021666..cc17afbb0067b1f57d8882640f63b2168d5b7624 2021-07-26 20:23:21 +0000 to 2021-08-02 20:28:08 +0000 - Stabilize the rust-version field (rust-lang/cargo#9732) - Remove nbsp characters. (rust-lang/cargo#9751) - Update unstable documentation TOC. (rust-lang/cargo#9750) - Some minor updates for package/publish package selection. (rust-lang/cargo#9749) - Bump to 0.57.0, update changelog (rust-lang/cargo#9748) - Stabilize `[env]` sections (rust-lang/cargo#9411) - doc: Clarify [doc].browser docs, document PathAndArgs better (rust-lang/cargo#9747) - Bump cargo-util version. (rust-lang/cargo#9745) - Make clippy happy (rust-lang/cargo#9736) - Fix typo in features doc (rust-lang/cargo#9737) - doc test supports silent output (rust-lang/cargo#9730)
Due to an accident due to the way I've been typing em-dash characters, a bunch of non-breaking space characters have snuck in to the source here. I never intended that, and I think having invisible characters that are not normal spaces can be confusing, so I just replaced them with spaces. There's still a few nbsp's where they are needed.