Rollup of 7 pull requests #87948
Merged
Rollup of 7 pull requests #87948
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: teor <[email protected]>
From what I can tell, the goal of the tests is to ensure that the error formatting is correct. I think this is still being tested as intended after this change.
`x.py setup` hardlinks this file into .git/hooks. Prior to this commit,
that led to the following warning emitted by `git commit`:
hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
Making the checked-in script executable fixes this issue, as the
hardlinked copy uses the same flags.
It looks like the file was originally executable, but that bit was
unset in commit b908905 of
rust-lang#85305. It's possible that was
unintentional.
Implement Extend<(A, B)> for (Extend<A>, Extend<B>) I oriented myself at the implementation of `Iterator::unzip` and also rewrote the impl in terms of `(A, B)::extend` after that. Since (A, B) now also implements Extend we could also mention in the documentation of unzip that it can do "nested unzipping" (you could unzip `Iterator<Item=(A, (B, C))>` into `(Vec<A>, (Vec<B>, Vec<C>))` for example) but I'm not sure of that so I'm asking here 🙂 (P.S. I saw a couple of people asking if there is an unzip3 but there isn't. So this could be a way to get equivalent functionality)
…es, r=estebank Warn when an escaped newline skips multiple lines Resolves rust-lang#87319
…=lnicola ⬆️ rust-analyzer
Reduce verbosity of tracing output of RUSTC_LOG The current output is really hard to read, I find, for things like trait selection. I nearly always end up removing these calls locally. r? ```@oli-obk``` since you originally authored this
Update books ## nomicon 2 commits in f51734eb5566c826b471977747ea3d7d6915bbe9..0c7e5bd1428e7838252bb57b7f0fbfda4ec82f02 2021-07-23 18:24:35 +0900 to 2021-08-04 10:18:22 -0700 - Document lifetime elision for fn types, Fn*, impl (rust-lang/nomicon#298) - Remove unnecessary `extern crate`s (rust-lang/nomicon#297) ## reference 3 commits in 3b7be075af5d6e402a18efff672a8a265b4596fd..4884fe45c14f8b22121760fb117181bb4da8dfe0 2021-07-26 13:20:11 -0700 to 2021-07-28 21:31:28 -0700 - Mention "function item type to `fn pointer`" coercion (rust-lang/reference#1079) - example for bindings after at (rust-lang/reference#1027) - array-expr.md: fix typo; 'polish' sentence (rust-lang/reference#1080) ## book 10 commits in a07036f864b37896b31eb996cd7aedb489f69a1f..7e49659102f0977d9142190e1ba23345c0f00eb1 2021-07-26 20:19:46 -0400 to 2021-08-03 21:41:35 -0400 - Make explicit that enum variant construction is a function - Clarify why None means we have to annotate the type - Make the convert quotes script able to do one chapter - Snapshot of chapter 5 - (rust-lang/book#2811) - (rust-lang/book#2809) - Ugh quote script, that's not right - Introduce the dbg macro. Connects to rust-lang/book#1658 - Add an example of declaring and instantiating unit-like structs. Fixes rust-lang/book#2442. - Remove authors field from all the manifests (rust-lang/book#2805) ## rustc-dev-guide 5 commits in 09343d6f921d2a07c66f8c41ec3d65bf1fa52556..c4644b427cbdaafc7a87be0ccdf5d8aaa07ac35f 2021-07-26 00:37:28 +0200 to 2021-08-10 20:41:44 +0900 - Remove a dead link in `new-target.md` + other nits (rust-lang/rustc-dev-guide#1186) - Add description of -opt-bisect-limit LLVM option (rust-lang/rustc-dev-guide#1182) - Fixed team responsible for stabilization (rust-lang/rustc-dev-guide#1181) - Add S-Inactive PRs as another source of things contributors could work on (rust-lang/rustc-dev-guide#1177) - git.md: Fix No-Merge Policy link ## embedded-book 1 commits in 09986cd352404eb4659db44613b27cac9aa652fc..4f9fcaa30d11ba52b641e6fd5206536d65838af9 2021-07-18 19:26:46 +0000 to 2021-08-06 17:43:12 +0000 - Fix typo in 'Memory Mapped Registers' (rust-embedded/book#298)
Update cargo 9 commits in cc17afbb0067b1f57d8882640f63b2168d5b7624..b51439fd8b505d4800a257acfecf3c69f81e35cf 2021-08-02 20:28:08 +0000 to 2021-08-09 18:40:05 +0000 - Deduplicate entries in cargo --list (rust-lang/cargo#9773) - Include aliases with other commands (rust-lang/cargo#9764) - Add a profile option to select the codegen backend (rust-lang/cargo#9118) - remove useless conversions (rust-lang/cargo#9617) - collapse nested if blocks (rust-lang/cargo#9613) - Refactor fake_file() away from cargo_command tests (rust-lang/cargo#9767) - Update cargo-platform to 0.1.2 (rust-lang/cargo#9762) - Bump to the latest jobserver dependency (rust-lang/cargo#9760) - Fix semver check for rust 1.54.0 (rust-lang/cargo#9763)
set the executable bit on pre-commit.sh
`x.py setup` hardlinks this file into .git/hooks. Prior to this commit,
that led to the following warning emitted by `git commit`:
hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
Making the checked-in script executable fixes this issue, as the
hardlinked copy uses the same flags.
It looks like the file was originally executable, but that bit was
unset in commit b908905 of
rust-lang#85305. It's possible that was
unintentional.
|
@bors r+ p=7 rollup=never |
|
📌 Commit 334f09b has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup