Rollup of 5 pull requests #91691
Merged
Rollup of 5 pull requests #91691
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
Use Vec extend instead of repeated pushes on several places Inspired by rust-lang#90813, I tried to use a simple regex (`for .*in.*\{\n.*push\(.*\);\n\s+}`) to search for more places that would use `Vec::push` in a loop and replace them with `Vec::extend`. These probably won't have as much perf. impact as the original PR (if any), but it would probably be better to do a perf run to see if there are not any regressions.
Improve 'cannot contain emoji' error. Before: ``` error: identifiers cannot contain emoji: `🦀` --> src/main.rs:2:9 | 2 | let 🦀 = 1; | ^^ ``` After: ``` error: Ferris cannot be used as an identifier --> src/main.rs:2:9 | 2 | let 🦀 = 1; | ^^ help: try using their name instead: `ferris` ``` r? `@estebank`
Pretty print break and continue without redundant space
**Repro:**
```rust
macro_rules! m {
($e:expr) => { stringify!($e) };
}
fn main() {
println!("{:?}", m!(loop { break; }));
println!("{:?}", m!(loop { break 'a; }));
println!("{:?}", m!(loop { break false; }));
}
```
**Before:**
- `"loop { break ; }"`
- `"loop { break 'a ; }"`
- `"loop { break false ; }"`
**After:**
- `"loop { break; }"`
- `"loop { break 'a; }"`
- `"loop { break false; }"`
<br>
Notice that `return` and `yield` already follow the same approach as this PR of printing the space *before* each additional piece following the keyword, rather than *after* each thing.
https://github.com/rust-lang/rust/blob/772d51f887fa407216860bf8ecf3f1a32fb795b4/compiler/rustc_ast_pretty/src/pprust/state.rs#L2148-L2154
https://github.com/rust-lang/rust/blob/772d51f887fa407216860bf8ecf3f1a32fb795b4/compiler/rustc_ast_pretty/src/pprust/state.rs#L2221-L2228
…lett
Implement `core::future::join!`
`join!` polls multiple futures concurrently and returns their outputs.
```rust
async fn run() {
let (a, b) = join!(async { 0 }, async { 1 });
}
```
cc `@rust-lang/wg-async-foundations`
update Miri Fixes rust-lang#91649 r? `@ghost`
|
@bors r+ rollup=never p=5 |
|
📌 Commit 229aa1b has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Dec 9, 2021
Tested on commit rust-lang/rust@e250777. Direct link to PR: <rust-lang/rust#91691> 🎉 miri on windows: test-fail → test-pass (cc @eddyb @oli-obk @RalfJung). 🎉 miri on linux: test-fail → test-pass (cc @eddyb @oli-obk @RalfJung).
This was referenced Dec 9, 2021
|
Finished benchmarking commit (e250777): comparison url. Summary: This benchmark run did not return any relevant changes. If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf. @rustbot label: -perf-regression |
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:
core::future::join!#91645 (Implementcore::future::join!)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup