Rollup of 7 pull requests by matthiaskrgr · Pull Request #93778 · rust-lang/rust

matthiaskrgr · 2022-02-08T15:40:53Z

Successful merges:

Point at type when a static #[global_allocator] doesn't impl GlobalAlloc #91950 (Point at type when a static #[global_allocator] doesn't impl GlobalAlloc)
Do not suggest char literal for zero-length strings #92715 (Do not suggest char literal for zero-length strings)
Don't constrain projection predicates with inference vars in GAT substs #92917 (Don't constrain projection predicates with inference vars in GAT substs)
Use NtCreateFile instead of NtOpenFile to open a file #93206 (Use NtCreateFile instead of NtOpenFile to open a file)
add fut/back compat tests for implied trait bounds #93732 (add fut/back compat tests for implied trait bounds)
⬆️ rust-analyzer #93764 (:arrow_up: rust-analyzer)
deduplicate lcnr in mailmap #93767 (deduplicate lcnr in mailmap)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…lobalAlloc`

…ce types or consts in GAT substs

…ator, r=matthewjasper Point at type when a `static` `#[global_allocator]` doesn't `impl` `GlobalAlloc`

Do not suggest char literal for zero-length strings PR rust-lang#92507 adds a hint to switch to single quotes when a char is expected and a single-character string literal is provided. The check to ensure the string literal is one character long missed the 0-char case, and would incorrectly offer the hint. This PR adds the missing check, and a test case to confirm the new behavior.

Don't constrain projection predicates with inference vars in GAT substs cc rust-lang#91762 Not a fix, but a mitigation to prevent a backwards-compatible hazard where we normalize using a predicate only because it's the only one available, but shouldn't. This would constrain an inference variable which didn't really want. We already do this when selecting a projection candidate, which isn't always correct. But changing that is a problem for a different day. Also found out that a suggestion for `await`ing a future was using the wrong substs. r? ``@nikomatsakis``

Use `NtCreateFile` instead of `NtOpenFile` to open a file Generally the internal `Nt*` functions should be avoided but when we do need to use one we should stick to the most commonly used for the job. To that end, this PR replaces `NtOpenFile` with `NtCreateFile`. NOTE: The initial version of this comment hypothesised that this may help with some recent false positives from malware scanners. This hypothesis proved wrong. Sorry for the distraction.

add fut/back compat tests for implied trait bounds the `guard` test was tested to cause a segfault with `-Zchalk`, very nice cc ``@nikomatsakis`` rust-lang#44491 rust-lang#25860

…=lnicola ⬆️ rust-analyzer r? ``@ghost``

deduplicate `lcnr` in mailmap

matthiaskrgr · 2022-02-08T15:41:09Z

@bors r+ rollup=never p=7

bors · 2022-02-08T15:41:10Z

📌 Commit ff3324c has been approved by matthiaskrgr

rust-log-analyzer · 2022-02-08T16:18:35Z

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 775e480722c7aba6ff4ff3ccec8c1f4639ae7889 and e13315b3ba694ab8ae50cb619dade0803bb5ac98
Submodules 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:
---
.......... (50/59)
........  (59/59)


/checkout/src/test/rustdoc-gui/search-tab-selection-if-current-is-empty.goml search-tab-selection-if-current-is-empty... FAILED
[ERROR] (line 6) TimeoutError: waiting for selector "#titles" failed: timeout 30000ms exceeded: for command `wait-for: "#titles"`
Build completed unsuccessfully in 0:00:48

matthiaskrgr · 2022-02-08T16:21:13Z

@bors retry

rustdoc test timeout

  IMAGE: x86_64-gnu-tools
##[endgroup]
From https://github.com/rust-lang/rust
 * branch              master     -> FETCH_HEAD
Searching for toolstate changes between 775e480722c7aba6ff4ff3ccec8c1f4639ae7889 and e13315b3ba694ab8ae50cb619dade0803bb5ac98
Submodules 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:
---
.......... (50/59)
........  (59/59)


/checkout/src/test/rustdoc-gui/search-tab-selection-if-current-is-empty.goml search-tab-selection-if-current-is-empty... FAILED
[ERROR] (line 6) TimeoutError: waiting for selector "#titles" failed: timeout 30000ms exceeded: for command `wait-for: "#titles"`
Build completed unsuccessfully in 0:00:48

bors · 2022-02-08T16:27:35Z

⌛ Testing commit ff3324c with merge 70390e345bd0aedae2b617a9c79750ab052f63a2...

ehuss · 2022-02-08T17:42:44Z

@matthiaskrgr This is the error I was mentioning in Zulip. I opened #93784 to track the sporadic failures.

bors · 2022-02-08T20:42:36Z

💥 Test timed out

rust-log-analyzer · 2022-02-08T20:56:29Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

matthiaskrgr · 2022-02-08T21:13:15Z

@bors retry timeout of msvc-1, dist-x86_64-musl, x86_64-netbsd

bors · 2022-02-08T21:53:54Z

⌛ Testing commit ff3324c with merge a946ba5f49d1475def337d07a9b159c052258c0f...

bors · 2022-02-08T22:33:00Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-02-08T22:35:15Z

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)

.......... (50/59)
.........  (59/59)


/checkout/src/test/rustdoc-gui/implementors.goml An exception occured: Failed to launch the browser process!
Inconsistency detected by ld.so: dl-tls.c: 493: _dl_allocate_tls_init: Assertion `listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!


TROUBLESHOOTING: https://github.com/puppeteer/puppeteer/blob/master/docs/troubleshooting.md
== STACKTRACE ==
Error
Error
    at innerRunTestCode (/node-v14.4.0-linux-x64/lib/node_modules/browser-ui-test/src/index.js:468:16)
    at runMicrotasks (<anonymous>)
    at processTicksAndRejections (internal/process/task_queues.js:97:5)

matthiaskrgr · 2022-02-08T22:41:09Z

@bors retry #93784

bors · 2022-02-09T01:18:12Z

⌛ Testing commit ff3324c with merge 9a5a961...

bors · 2022-02-09T04:05:49Z

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

rust-timer · 2022-02-09T06:24:52Z

Finished benchmarking commit (9a5a961): 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

estebank and others added 16 commits December 15, 2021 01:40

Point at type when a static #[global_allocator] doesn't impl `G…

84408ca

…lobalAlloc`

Only suggest char literal for single-character strings

9622a42

Use NtCreateFile instead of NtOpenFile to open a file

ac02fcc

add fut/back compat tests for implied trait bounds

c965d0e

Don't match any projection predicates when the obligation has inferen…

3602e0e

…ce types or consts in GAT substs

Change inference var check to be in project_type

7ad48bd

nit

af9e30a

⬆️ rust-analyzer

4eb5fe1

deduplicate lcnr in mailmap

2b20072

Rollup merge of rust-lang#91950 - estebank:point-at-type-of-non-alloc…

d7c2eda

…ator, r=matthewjasper Point at type when a `static` `#[global_allocator]` doesn't `impl` `GlobalAlloc`

Rollup merge of rust-lang#93732 - lcnr:hrlt-backcompa, r=Mark-Simulacrum

e881d65

add fut/back compat tests for implied trait bounds the `guard` test was tested to cause a segfault with `-Zchalk`, very nice cc ``@nikomatsakis`` rust-lang#44491 rust-lang#25860

Rollup merge of rust-lang#93764 - lnicola:rust-analyzer-2022-02-08, r…

b2b731f

…=lnicola ⬆️ rust-analyzer r? ``@ghost``

Rollup merge of rust-lang#93767 - lcnr:mailmap, r=Mark-Simulacrum

ff3324c

deduplicate `lcnr` in mailmap

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 8, 2022

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 8, 2022

ehuss mentioned this pull request Feb 8, 2022

rustdoc-gui tests sporadically failing #93784

Open

bors 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 Feb 8, 2022

bors 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 Feb 8, 2022

bors 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 Feb 8, 2022

bors 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 Feb 8, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 9, 2022

bors merged commit 9a5a961 into rust-lang:master Feb 9, 2022

rustbot added this to the 1.60.0 milestone Feb 9, 2022

bors mentioned this pull request Feb 9, 2022

Support #[global_allocator] without the allocator shim #86844

Merged

matthiaskrgr deleted the rollup-yfngdao branch February 13, 2022 00:53

Uh oh!

Conversation

matthiaskrgr commented Feb 8, 2022

Uh oh!

matthiaskrgr commented Feb 8, 2022

Uh oh!

bors commented Feb 8, 2022

Uh oh!

rust-log-analyzer commented Feb 8, 2022

Uh oh!

matthiaskrgr commented Feb 8, 2022

Uh oh!

bors commented Feb 8, 2022

Uh oh!

ehuss commented Feb 8, 2022

Uh oh!

bors commented Feb 8, 2022

Uh oh!

rust-log-analyzer commented Feb 8, 2022

Uh oh!

matthiaskrgr commented Feb 8, 2022

Uh oh!

bors commented Feb 8, 2022

Uh oh!

bors commented Feb 8, 2022

Uh oh!

rust-log-analyzer commented Feb 8, 2022

Uh oh!

matthiaskrgr commented Feb 8, 2022

Uh oh!

bors commented Feb 9, 2022

Uh oh!

bors commented Feb 9, 2022

Uh oh!

rust-timer commented Feb 9, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants