Conversation
|
|
📌 Commit 31019c2a8f00a1a08b7d486cc544eef658ba9bb1 has been approved by |
Depends on whether you fancy more emails from GitHub or not ;) |
|
🔒 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 job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Update RLS and Rustfmt Supersedes rust-lang#62537. Closes rust-lang#62803. Fixes fallout after rust-lang#62679. r? @ghost
No functional changes (except introducing user-configurable
crate_blacklist), most importantly bumps RLS version to 1.38 to match the current nightly version.r? @Centril