Rollup of 7 pull requests#72478

Dylan-DPC-zz · 2020-05-22T19:45:06Z

Successful merges:

Allow using Self:: in doc #71289 (Allow using Self:: in doc)
Improve E0599 explanation #72375 (Improve E0599 explanation)
Add some teams to prioritization exclude_labels #72385 (Add some teams to prioritization exclude_labels)
Allow rust-highfive to label issues it creates. #72395 (Allow rust-highfive to label issues it creates.)
Add flag to open docs: x.py doc --open #72453 (Add flag to open docs: x.py doc --open)
Add core::future::IntoFuture #72459 (Add core::future::IntoFuture)
Clean up E0600 explanation #72461 (Clean up E0600 explanation)

Failed merges:

Tested with: # opens doc/index.html x.py doc --stage 0 --open x.py doc --stage 0 --open src/doc # opens doc/book/index.html x.py doc --stage 0 --open src/doc/book # opens doc/std/index.html x.py doc --stage 0 --open src/libstd # opens doc/proc_macro/index.html x.py doc --stage 0 --open src/libproc_macro # opens both x.py doc --stage 0 --open src/libstd src/libproc_macro

This patch adds `core::future::IntoFuture`. However unlike earlier PRs this patch does not integrate it into the `async/.await` lowering. That integration should be done in a follow-up PR.

Replace sets with lists.

On my machine, an error looks like: Finished release [optimized] target(s) in 0.29s Opening doc /git/rust/build/x86_64-unknown-linux-gnu/doc/std/index.html command 'xdg-open (internal)' did not execute successfully; exit code: 4 command stderr: gio: file:///git/rust/build/x86_64-unknown-linux-gnu/doc/std/index.html: Error when getting information for file “/git/rust/build/x86_64-unknown-linux-gnu/doc/std/index.html”: No such file or directory Build completed successfully in 0:00:08

…Gomez Allow using `Self::` in doc Closes rust-lang#70802

@Dylan-DPC

…an-DPC Improve E0599 explanation r? @Dylan-DPC

@Mark-Simulacrum

…rk-Simulacrum Add some teams to prioritization exclude_labels r? @Mark-Simulacrum @LeSeulArtichaut

Allow rust-highfive to label issues it creates. This is my first meaningful PR, I am unsure how to test this code so any pointers would be welcome! I am about 50% sure it works.

Add flag to open docs: x.py doc --open This aligns with Cargo's flag `cargo doc --open`. Tested with: ```bash # opens doc/index.html x.py doc --stage 0 --open x.py doc --stage 0 --open src/doc # opens doc/book/index.html x.py doc --stage 0 --open src/doc/book # opens doc/std/index.html x.py doc --stage 0 --open src/libstd # opens doc/proc_macro/index.html x.py doc --stage 0 --open src/libproc_macro # opens both x.py doc --stage 0 --open src/libstd src/libproc_macro ```

…akis Add core::future::IntoFuture This patch reintroduces the `core::future::IntoFuture` trait. However unlike earlier PRs this patch does not integrate it into the `async/.await` lowering since that lead to performance regressions. By introducing the trait separately from the integration, the integration PR can be more narrowly scoped, and people can start trying out the `IntoFuture` trait today. Thanks heaps! cc/ @rust-lang/wg-async-foundations ## References - Original PR adding `IntoFuture` rust-lang#65244 - Open issue to re-land `IntoFuture` (assigned to me) rust-lang#67982 - Tracking issue for `IntoFuture` rust-lang#67644

@Dylan-DPC

…an-DPC Clean up E0600 explanation r? @Dylan-DPC

Dylan-DPC-zz · 2020-05-22T19:45:28Z

@bors r+ rollup=never p=7

Dylan-DPC-zz · 2020-05-22T19:47:21Z

@bors ping

bors · 2020-05-22T19:47:22Z

😪 I'm awake I'm awake

Dylan-DPC-zz · 2020-05-22T19:47:53Z

@bors r+ rollup=never p=7

bors · 2020-05-22T19:47:54Z

📌 Commit bf1b998 has been approved by Dylan-DPC

bors · 2020-05-22T19:48:34Z

⌛ Testing commit bf1b998 with merge 38ffa6f38ac055ae26dbc80d6cc8a91f6fedb76f...

bors · 2020-05-22T19:49:33Z

💔 Test failed - checks-azure

Dylan-DPC-zz · 2020-05-22T19:53:11Z

spurious

@bors retry

bors · 2020-05-22T20:00:52Z

💔 Test failed - checks-azure

rust-highfive · 2020-05-22T20:10:29Z

The job x86_64-gnu-llvm-8 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

##[section]Starting: Linux x86_64-gnu-llvm-8
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 63'
Agent machine name: 'fv-az578'
Current agent version: '2.169.0'
##[group]Operating System
16.04.6
LTS
LTS
##[endgroup]
##[group]Virtual Environment
Environment: ubuntu-16.04
Version: 20200517.1
Included Software: https://github.com/actions/virtual-environments/blob/ubuntu16/20200517.1/images/linux/Ubuntu1604-README.md
##[endgroup]
Agent running as: 'vsts'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.163.2)
Checking job knob settings.
   Knob: AgentToolsDirectory = /opt/hostedtoolcache Source: ${AGENT_TOOLSDIRECTORY} 
   Knob: AgentPerflog = /home/vsts/perflog Source: ${VSTS_AGENT_PERFLOG} 
Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/df0dcfd3-3495-4ef4-8b3d-bec6b0d5d546.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/72478/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/72478/merge:refs/remotes/pull/72478/merge
---
 ---> cb2676f08729
Step 5/8 : ENV RUST_CONFIGURE_ARGS       --build=x86_64-unknown-linux-gnu       --llvm-root=/usr/lib/llvm-8       --enable-llvm-link-shared       --set rust.thin-lto-import-instr-limit=10
 ---> Using cache
 ---> df25ce111862
Step 6/8 : ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy &&            python2.7 ../x.py test src/test/mir-opt --pass=build                                   --target=armv5te-unknown-linux-gnueabi &&            python2.7 ../x.py test src/tools/tidy
 ---> 599b9ac96b27
Step 7/8 : ENV NO_DEBUG_ASSERTIONS=1
 ---> Using cache
 ---> 091087e35a36

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

emilyalbini · 2020-05-22T20:13:07Z

@bors treeclosed=1000

GitHub outage.

Aaron1011 · 2020-05-23T03:28:24Z

@bors untreeclosed

Github outage has ended: https://www.githubstatus.com/incidents/6tcfpztf6j9m

Aaron1011 · 2020-05-23T03:29:59Z

@bors treeclosed-

JohnTitor · 2020-05-23T04:41:20Z

@bors retry

bors · 2020-05-23T07:18:23Z

⌛ Testing commit bf1b998 with merge 75b0a68...

bors · 2020-05-23T10:46:48Z

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 75b0a68 to master...

GuillaumeGomez and others added 15 commits May 20, 2020 12:03

Improve E0599 explanation

e9ae64c

Add some teams to prioritization exclude_labels

93abdd7

Add core::future::IntoFuture

9ff5020

This patch adds `core::future::IntoFuture`. However unlike earlier PRs this patch does not integrate it into the `async/.await` lowering. That integration should be done in a follow-up PR.

Clean up E0600 explanation

6e5cb37

Allow using Self:: in doc

fc0675b

Allow rust-highfive to label issues it creates.

dc4b9fd

Replace sets with lists.

Rollup merge of rust-lang#71289 - xliiv:70802-intra-self, r=Guillaume…

dd78839

…Gomez Allow using `Self::` in doc Closes rust-lang#70802

Rollup merge of rust-lang#72375 - GuillaumeGomez:cleanup-e0599, r=Dyl…

47f3c44

…an-DPC Improve E0599 explanation r? @Dylan-DPC

Rollup merge of rust-lang#72385 - spastorino:add-exclude-labels, r=Ma…

84fbbde

…rk-Simulacrum Add some teams to prioritization exclude_labels r? @Mark-Simulacrum @LeSeulArtichaut

Rollup merge of rust-lang#72395 - Elinvynia:highfive, r=Mark-Simulacrum

01adfe1

Allow rust-highfive to label issues it creates. This is my first meaningful PR, I am unsure how to test this code so any pointers would be welcome! I am about 50% sure it works.

Rollup merge of rust-lang#72461 - GuillaumeGomez:cleanup-e0600, r=Dyl…

bf1b998

…an-DPC Clean up E0600 explanation r? @Dylan-DPC

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 22, 2020

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 May 22, 2020

JohnTitor added the rollup A PR which is a rollup label May 23, 2020

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 May 23, 2020

bors mentioned this pull request May 23, 2020

Add some regression tests #72492

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label May 23, 2020

bors merged commit 75b0a68 into rust-lang:master May 23, 2020

Uh oh!

Conversation

Dylan-DPC-zz commented May 22, 2020

Uh oh!

Dylan-DPC-zz commented May 22, 2020

Uh oh!

Dylan-DPC-zz commented May 22, 2020

Uh oh!

bors commented May 22, 2020

Uh oh!

Dylan-DPC-zz commented May 22, 2020

Uh oh!

bors commented May 22, 2020

Uh oh!

bors commented May 22, 2020

Uh oh!

bors commented May 22, 2020

Uh oh!

Dylan-DPC-zz commented May 22, 2020

Uh oh!

bors commented May 22, 2020

Uh oh!

rust-highfive commented May 22, 2020

Uh oh!

emilyalbini commented May 22, 2020

Uh oh!

Aaron1011 commented May 23, 2020

Uh oh!

Aaron1011 commented May 23, 2020

Uh oh!

JohnTitor commented May 23, 2020

Uh oh!

bors commented May 23, 2020

Uh oh!

bors commented May 23, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants