Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #92352

Merged
merged 16 commits into from
Dec 28, 2021
Merged

Rollup of 7 pull requests #92352

merged 16 commits into from
Dec 28, 2021

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Aaron1011 and others added 16 commits December 18, 2021 11:26
Fixes rust-lang#92073

There's not really anything we can do with them, and they're
causing ICEs. I'm not using a wildcard match, as we should check
that any new `PredicateKind`s are handled properly by rustdoc.
…, r=cjgillot

Ignore other `PredicateKind`s in rustdoc auto trait finder

Fixes rust-lang#92073

There's not really anything we can do with them, and they're
causing ICEs. I'm not using a wildcard match, as we should check
that any new `PredicateKind`s are handled properly by rustdoc.
Remove VCVARS_BAT

This environment variable is no longer used.  It was used in the original Azure Pipelines configuration (rust-lang#60777). When GitHub Actions were added (rust-lang#70190), it was no longer used, and I suspect it was just an oversight while transitioning the configuration.
…acrum

Add a test suite for stringify macro

This attempts to cover the behavior of `stringify!` on various interpolated syntax tree nodes.

The pretty printer has a history of unsightly whitespace (double spaces, missing spaces, spaces where there shouldn't be spaces) — rust-lang#91437, rust-lang#91562, rust-lang#91568. There are several such issues left; the test cases that I consider to be currently behaving incorrectly are marked with `// FIXME` in the PR.
…ns, r=cjgillot

Tighten span when suggesting lifetime on path

This is kind of a hack.

Really the issue here is that we want to suggest the segment's span if the path resolves to something defined outside of the macro, and the macro's span if it resolves to something defined within.. I'll look into seeing if we can do something like that.

Fixes rust-lang#92324

r? `@cjgillot`
…r=Manishearth

Document units for `std::column`

Fixes rust-lang#92301.

r? ``@Manishearth`` (for the terminology and the Chinese)
…=lnicola

⬆️ rust-analyzer

r? ``@ghost``
@rustbot 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 Dec 28, 2021
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Dec 28, 2021

📌 Commit 11c71d2 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 Dec 28, 2021
@bors
Copy link
Contributor

bors commented Dec 28, 2021

⌛ Testing commit 11c71d2 with merge c82eff091b454cb2618a685a56d507fc3ab32f64...

@bors
Copy link
Contributor

bors commented Dec 28, 2021

💔 Test failed - checks-actions

@bors 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 Dec 28, 2021
@rust-log-analyzer
Copy link
Collaborator

The job dist-x86_64-apple-alt 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): VMFXTRZ3K4JI
      Provisioning UDID: 4203018E-580F-C1B5-9525-B745CECA79EB

hw.ncpu: 3
hw.byteorder: 1234

@matthiaskrgr
Copy link
Member Author

@bors retry crates.io timeout

 Downloading crates ...
warning: spurious network error (2 tries remaining): [28] Timeout was reached (failed to download any data for `rustc-demangle v0.1.21` within 30s)
warning: spurious network error (2 tries remaining): [28] Timeout was reached (failed to download any data for `object v0.26.2` within 30s)
warning: spurious network error (2 tries remaining): [28] Timeout was reached (failed to download any data for `miniz_oxide v0.4.0` within 30s)
warning: spurious network error (2 tries remaining): [28] Timeout was reached (failed to download any data for `hashbrown v0.11.0` within 30s)
warning: spurious network error (2 tries remaining): [28] Timeout was reached (failed to download any data for `gimli v0.25.0` within 30s)
warning: spurious network error (2 tries remaining): [28] Timeout was reached (failed to download any data for `compiler_builtins v0.1.66` within 30s)
warning: spurious network error (2 tries remaining): [28] Timeout was reached (download of `adler v0.2.3` failed to transfer more than 10 bytes in 30s)
warning: spurious network error (2 tries remaining): [28] Timeout was reached (failed to download any data for `addr2line v0.16.0` within 30s)
warning: spurious network error (1 tries remaining): [28] Timeout was reached (failed to download any data for `addr2line v0.16.0` within 30s)
warning: spurious network error (1 tries remaining): [28] Timeout was reached (failed to download any data for `adler v0.2.3` within 30s)
warning: spurious network error (1 tries remaining): [28] Timeout was reached (failed to download any data for `compiler_builtins v0.1.66` within 30s)
warning: spurious network error (1 tries remaining): [28] Timeout was reached (failed to download any data for `gimli v0.25.0` within 30s)
warning: spurious network error (1 tries remaining): [28] Timeout was reached (failed to download any data for `hashbrown v0.11.0` within 30s)
warning: spurious network error (1 tries remaining): [28] Timeout was reached (failed to download any data for `miniz_oxide v0.4.0` within 30s)
warning: spurious network error (1 tries remaining): [28] Timeout was reached (download of `object v0.26.2` failed to transfer more than 10 bytes in 30s)
warning: spurious network error (1 tries remaining): [28] Timeout was reached (failed to download any data for `rustc-demangle v0.1.21` within 30s)
error: failed to download from `https://crates.io/api/v1/crates/adler/0.2.3/download`

Build completed unsuccessfully in 0:14:18
Caused by:
== clock drift check ==
  [28] Timeout was reached (download of `adler v0.2.3` failed to transfer more than 10 bytes in 30s)
  local time: Tue Dec 28 13:46:05 UTC 2021
  network time: Tue, 28 Dec 2021 13:46:05 GMT

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 28, 2021
@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 Dec 28, 2021
@matthiaskrgr matthiaskrgr reopened this Dec 28, 2021
@matthiaskrgr
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Dec 28, 2021

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Dec 28, 2021

📌 Commit 11c71d2 has been approved by matthiaskrgr

@bors
Copy link
Contributor

bors commented Dec 28, 2021

⌛ Testing commit 11c71d2 with merge 83b15bf...

@bors
Copy link
Contributor

bors commented Dec 28, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 28, 2021
@bors bors merged commit 83b15bf into rust-lang:master Dec 28, 2021
@rustbot rustbot added this to the 1.59.0 milestone Dec 28, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (83b15bf): 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

@matthiaskrgr matthiaskrgr deleted the rollup-19fbq7u branch January 2, 2022 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.