Skip to content

Rollup of 6 pull requests - #100082

Merged
bors merged 55 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ywu4iux
Aug 3, 2022
Merged

Rollup of 6 pull requests#100082
bors merged 55 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ywu4iux

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

zachs18and others added 30 commits July 25, 2022 15:45
…lnicola
Find standalone proc-macro-srv on windows too
I forgot that executables end with `.exe` on Windows in:
* rust-lang/rust-analyzer#12858
fix: Fix server panicking on project loading when proc-macros are disabled
Fixesrust-lang/rust-analyzer#12879
fix: Insert spaces when inlining a function defined in a macro.
(partially) fixesrust-lang#12860.
This PR (only) addresses the whitespace issue when inlining functions defined in macros.
Additionally, the indentation/spacing is not ideal, but works, e.g.
```rs
macro_rules! define_function {
() => { fn test_function_macro() {
if let Some(3) = 3i32.checked_add(0) {
println!("3 + 0 == 3");
}
} };
}
define_function!();
fn main() {
test_function_macro();
}
// previously became
// ...
fn main() {
ifletSome(3)=3i32.checked_add(0){println!("3 + 0 == 3");};
}
// now becomes
// ...
fn main() {
if let Some(3) = 3i32.checked_add(0){
println!("3 + 0 == 3");
};
}
```
The `self` -> `this` problem[^this] is (probably?) a separate problem that I am also looking into.
[^this]: As mentioned in [my comment on the above issue](rust-lang/rust-analyzer#12860 (comment)), inlining a method defined in a macro does not properly replace `self` with the new local `this`.
fix: Fix Semantics::original_ast_node not caching the resulting file
fix: Honor ref expressions for compute_ref_match completions
Fixesrust-lang/rust-analyzer#8357
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
…x, r=Veykril
Find original ast node before compute ref match
ref rust-lang/rust-analyzer#12717
internal: Assume condition/iterable is missing if there is only a BlockExpr
cc rust-lang/rust-analyzer#12880 (comment)
It sounds good on paper, so let's try it
Use large stack on expander thread
I have verified that this fixesrust-lang#12884 for me.
Hat tip to `@bjorn3` for identifying the cause of the issue.
fix: Do completions in path qualifier position
Fixesrust-lang/rust-analyzer#12566
Not too happy with the duplication needed for this, but it is what it is. Completions in path qualifiers will have to be filtered properly still, but its better to show too many completions for this than too few for now.
publish: Use cargo ws rename to rename crates
Follow up for rust-lang#12716
petrochenkovand others added 7 commits August 2, 2022 22:29
…-Simulacrum
parallelize HTML checking tool
there's a lot of IO, so timings on my laptop are far from stable, but it seems to be considerably faster.
this step often appears to take 5+ minutes in CI, so hopefully this offers a speedup
…-errors
Improve position named arguments lint underline and formatting names
For named arguments used as implicit position arguments, underline both
the opening curly brace and either:
* if there is formatting, the next character (which will either be the
closing curl brace or the `:` denoting the start of formatting args)
* if there is no formatting, the entire arg span (important if there is
whitespace like `{ }`)
This should make it more obvious where the named argument should be.
Additionally, in the lint message, emit the formatting argument names
without a dollar sign to avoid potentially confusion.
Fixesrust-lang#99907
Clarify Cargo.toml comments
Existing comments were left in an incoherent state after rust-lang#99768.
r? `@RalfJung`
rustc-docs: Be less specific about the representation of `+bundle`
For rust-lang#99429.
r? `@bjorn3`
@rustbotrustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 2, 2022
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=10

@bors

bors commented Aug 2, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit e20f7f8 has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 2, 2022
@bors

bors commented Aug 3, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e20f7f8 with merge acd0db76d6536fd56f8cf35a79be1659fe74d472...

@bors

bors commented Aug 3, 2022

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 3, 2022
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job dist-x86_64-apple failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)
 Memory: 14 GB
System Firmware Version: VMW71.00V.13989454.B64.1906190538
Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
SMC Version (system): 2.8f0
Serial Number (system): VMTDDijafbFO
Provisioning UDID: 4203018E-580F-C1B5-9525-B745CECA79EB
hw.ncpu: 3
hw.byteorder: 1234

@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors retry

@borsbors 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 Aug 3, 2022
@bors

bors commented Aug 3, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e20f7f8 with merge e141246...

@bors

bors commented Aug 3, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing e141246 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 3, 2022
@bors
bors merged commit e141246 into rust-lang:masterAug 3, 2022
@rustbotrustbot added this to the 1.64.0 milestone Aug 3, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#Perf Build Sha
#100074a1c75f89310d980629e3078439b3bf3967be32f5
#100070a944c8f50f0929c983abc8849937cfe1019f1d20
#100049f04a09de8deeeaff01fa78fb112fff7a73f3f859
#1000083904b710273dfd5f78b7cfdbf647ff89e5a74f35
#99958cb7f310aa5dc80724824688afe20fb98555d1ab4
#999339a20bd17ae448a8667f3536ca6940412d6a6a27c

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e141246): comparison url.

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results
  • Primary benchmarks: 😿 relevant regression found
  • Secondary benchmarks: no relevant changes found
mean1maxcount2
Regressions 😿
(primary)
2.3%2.3%1
Regressions 😿
(secondary)
N/AN/A0
Improvements 🎉
(primary)
N/AN/A0
Improvements 🎉
(secondary)
N/AN/A0
All 😿🎉 (primary)2.3%2.3%1

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change

  2. number of relevant changes

@matthiaskrgr
matthiaskrgr deleted the rollup-ywu4iux branch October 9, 2022 00:31
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

18 participants

@matthiaskrgr@bors@rust-log-analyzer@rust-timer@rustbot@zachs18@fasterthanlime@Veykril@0xPoe@umanwizard@pksunkara@lnicola@cynecx@alex@jyn514@PrestonFrom@mqudsi@petrochenkov