Skip to content

Rollup of 4 pull requests#94966

Merged
bors merged 8 commits intorust-lang:masterfrom
matthiaskrgr:rollup-iqzswh3
Mar 15, 2022
Merged

Rollup of 4 pull requests#94966
bors merged 8 commits intorust-lang:masterfrom
matthiaskrgr:rollup-iqzswh3

Conversation

@matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Mar 15, 2022

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

michaelwoerister and others added 8 commits March 10, 2022 17:04
@michaelwoerister
debuginfo: Fix bug in type name generation for dyn types with associa…
5cd8a2a 
…ted types but no other generic arguments.
@Dylan-DPC
fix typos
13e8899
@martingms
Fix small typo in FIXME
0d6e51e
@est31
Support other types of pluralization in pluralize macro
3bf9124
@matthiaskrgr
Rollup merge of rust-lang#94810 - michaelwoerister:fix-trait-pointer-…
e755f2c 
…debuginfo-names, r=wesleywiser

debuginfo: Fix bug in type name generation for dyn types with associated types but no other generic arguments.

For types like `&dyn Future<Output=bool>` the compiler currently emits invalid types names in debuginfo. This PR fixes this.

Before:
```txt
// DWARF
&dyn core::future::future::Future, Output=bool>

// CodeView
ref$<dyn$<core::future::future::Future,assoc$<Output,bool> > > >
```

After:
```txt
// DWARF
&dyn core::future::future::Future<Output=bool>

// CodeView
ref$<dyn$<core::future::future::Future<assoc$<Output,bool> > > >
```

These syntactically incorrect type names can cause downstream tools (e.g. debugger extensions) crash when trying to parse them.

r? `@wesleywiser`
@matthiaskrgr
Rollup merge of rust-lang#94947 - Dylan-DPC:fix/typos, r=oli-obk
277802e 
fix typos

Rework of rust-lang#94603 which got closed as I was trying to unmerge and repush.  This is a subset of changes from the original pr as I sed'd whatever typos I remembered from the original PR

thanks to `@cuishuang` for the original PR
@matthiaskrgr
Rollup merge of rust-lang#94956 - martingms:fix-fixme-comment-typo, r…
32ca1a6 
…=lqd

Fix small typo in FIXME

I introduced a few small typos when linking to an optimizing PR, this PR fixes them.

r? `@lqd`
@matthiaskrgr
Rollup merge of rust-lang#94958 - est31:pluralize, r=oli-obk
183262d 
Support other types of pluralization in pluralize macro
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 15, 2022
@matthiaskrgr
Copy link
Member Author

matthiaskrgr commented Mar 15, 2022

@bors r+ rollup=never p=4

@bors
Copy link
Collaborator

bors commented Mar 15, 2022

📌 Commit 183262d has been approved by matthiaskrgr

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 15, 2022
@bors
Copy link
Collaborator

bors commented Mar 15, 2022

⌛ Testing commit 183262d with merge 83460d5...

@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented Mar 15, 2022

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

Click to see the possible cause of the failure (guessed by this bot) 
  IMAGE: x86_64-gnu-tools
##[endgroup]
From https://github.com/rust-lang/rust
 * branch              master     -> FETCH_HEAD
Searching for toolstate changes between be52b4af5ec7e49572cb16519b7e144d6bcb051d and 67d451a00586653be47bd535799cdceef225e869
Clippy or rustfmt subtrees were updated
##[group]Run src/ci/scripts/verify-channel.sh
src/ci/scripts/verify-channel.sh
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
env:
---
.......... (60/62)
.         (62/62)


/checkout/src/test/rustdoc-gui/escape-key.goml escape-key... FAILED
[ERROR] (line 6) TimeoutError: waiting for selector "#search h1" failed: timeout 30000ms exceeded: for command `wait-for: "#search h1" // The search element is empty before the first search `
[ERROR] (line 7) Error: Evaluation failed: expected `content` for attribute `class` for selector `#search`, found `content hidden`: for command `assert-attribute: ("#search", {"class": "content"})`
[ERROR] (line 8) Error: Evaluation failed: expected `content hidden` for attribute `class` for selector `#main-content`, found `content`: for command `assert-attribute: ("#main-content", {"class": "content hidden"})`
Build completed unsuccessfully in 0:00:42

@bors
Copy link
Collaborator

bors commented Mar 15, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 15, 2022
@bors bors merged commit 83460d5 into rust-lang:master Mar 15, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 15, 2022
@bors bors mentioned this pull request Mar 15, 2022
Merged
@rust-timer
Copy link
Collaborator

rust-timer commented Mar 15, 2022

Finished benchmarking commit (83460d5): comparison url.

Summary: This benchmark run did not return any relevant results.

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

@rustbot label: -perf-regression

@matthiaskrgr matthiaskrgr deleted the rollup-iqzswh3 branch July 30, 2022 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.61.0

Development

Successfully merging this pull request may close these issues.

9 participants

@matthiaskrgr @bors @rust-log-analyzer @rust-timer @rustbot @michaelwoerister @Dylan-DPC @martingms @est31