Skip to content

Rollup of 6 pull requests - #72132

Closed
Dylan-DPC-zz wants to merge 16 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-njzf2qn
Closed

Rollup of 6 pull requests#72132
Dylan-DPC-zz wants to merge 16 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-njzf2qn

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

RalfJungand others added 16 commits May 1, 2020 11:16
Co-authored-by: Bastian Kauschke <bastian_kauschke@hotmail.de>
…aster
Miri: run liballoc tests with threads
Miri now supports threads, so we can run these tests. :)
Fix unused_parens false positive when using binary operations
Fixesrust-lang#71290
r? @cuviper who provided instructions
…Gomez
Add strikethrough support to rustdoc
Implements uncontroversial part of rust-lang#71183.
r? @GuillaumeGomez
…ewjasper
Make MIR typeck use `LocalDefId` and fix docs
The docs on `fn type_check` were not in sync with the arguments it takes.
r? @matthewjasper
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=6

@bors

bors commented May 12, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 733dce8 has been approved by Dylan-DPC

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

Copy link
Copy Markdown
Contributor

The job mingw-check 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 mingw-check
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 55'
Agent machine name: 'fv-az619'
Current agent version: '2.168.2'
##[group]Operating System
16.04.6
LTS
LTS
##[endgroup]
##[group]Virtual Environment
Environment: ubuntu-16.04
Version: 20200430.2
Included Software: https://github.com/actions/virtual-environments/blob/ubuntu16/20200430.2/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.1)
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/94810a85-587b-42e5-8d19-e7959cbe62d7.sh
##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/72132/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/72132/merge:refs/remotes/pull/72132/merge
---
---> 3adb0605cc65
Step 6/7 : ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
---> Using cache
---> 28dbc326cb7f
Step 7/7 : ENV SCRIPT python3 ../x.py test src/tools/expand-yaml-anchors && python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && python3 ../x.py build --stage 0 src/tools/build-manifest && python3 ../x.py test --stage 0 src/tools/compiletest && python3 ../x.py test src/tools/tidy && python3 ../x.py doc --stage 0 src/libstd && /scripts/validate-toolstate.sh
---> 537a01811900
Successfully built 537a01811900
Successfully tagged rust-ci:latest
Built container sha256:537a018119009dc218456238dec90b5530050db1e2a1e166550c218003f6159d
---
Checking rustc_feature v0.0.0 (/checkout/src/librustc_feature)
Checking fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
Checking rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
Checking rustc_hir v0.0.0 (/checkout/src/librustc_hir)
Checking rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
Checking chalk-rust-ir v0.10.0
Checking rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
Checking rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
Checking rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
Checking chalk-solve v0.10.0
error[E0107]: wrong number of type arguments: expected at most 1, found 2
--> src/librustc_middle/mir/interpret/pointer.rs:94:11
|
94 | ptr: &Pointer<Tag, Id>,
| ^^^^^^^^^^^^^^^^ expected at most 1 type argument
error: aborting due to previous error
For more information about this error, try `rustc --explain E0107`.
error: could not compile `rustc_middle`.
error: could not compile `rustc_middle`.
To learn more, run the command again with --verbose.
warning: build failed, waiting for other jobs to finish...
error: build failed
command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--color" "always" "--features" " llvm" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json-render-diagnostics"
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
Build completed unsuccessfully in 0:04:08
== clock drift check ==
local time: Tue May 12 09:14:52 UTC 2020
local time: Tue May 12 09:14:52 UTC 2020
network time: Tue, 12 May 2020 09:14:52 GMT
== end clock drift check ==
##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/72132/merge to s
Task : Get sources
Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version : 1.0.0
Author : Microsoft
Author : Microsoft
Help : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/72132/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (4066) (python)
##[section]Finishing: Finalize Job

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)

@bors

bors commented May 12, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 733dce8 with merge 428b5e2440ac46e39c104bc4e91395ef0aacd229...

@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 12, 2020
@bors

bors commented May 12, 2020

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 12, 2020
@Dylan-DPC-zz
Dylan-DPC-zz deleted the rollup-njzf2qn branch May 12, 2020 09:39
@RalfJungRalfJung added the rollup A PR which is a rollup label May 14, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@Dylan-DPC-zz@bors@rust-highfive@RalfJung@mibac138@jonas-schievink@Dylan-DPC