Rollup of 13 pull requests #62960

Centril · 2019-07-24T22:57:16Z

Successful merges:

rustdoc: make #[doc(include)] relative to the containing file #60938 (rustdoc: make #[doc(include)] relative to the containing file)
Fix some sanity checks #61890 (Fix some sanity checks)
allow clippy::unreadable_literal in unicode tables #62084 (allow clippy::unreadable_literal in unicode tables)
Take substs into account in conservative_is_privately_uninhabited #62261 (Take substs into account in conservative_is_privately_uninhabited)
Add joining slices of slices with a slice separator, not just a single item #62528 (Add joining slices of slices with a slice separator, not just a single item)
Turn #[global_allocator] into a regular attribute macro #62735 (Turn #[global_allocator] into a regular attribute macro)
Remove support for -Zlower-128bit-ops #62801 (Remove support for -Zlower-128bit-ops)
Revert "Disable stack probing for gnux32." #62808 (Revert "Disable stack probing for gnux32.")
Improve some pointer-related documentation #62822 (Improve some pointer-related documentation)
Disable d32 on armv6 hf targets #62904 (Disable d32 on armv6 hf targets)
Initialize the MSP430 AsmParser #62907 (Initialize the MSP430 AsmParser)
Add method disambiguation help for trait implementation #62921 (Add method disambiguation help for trait implementation)
Use match ergonomics in Condvar documentation #62942 (Use match ergonomics in Condvar documentation)

Failed merges:

r? @ghost

…e item

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Also modifies the generation script to emit 2018 edition paths.

It is broken and unused

…se drop

…t be non-NULL

…e it is dereferenced

This allows the same logic used by `include_X!` macros to be used by `#[doc(include)]`.

This makes them relative to the containing file instead of the crate root

Co-Authored-By: gnzlbg <gnzlbg@users.noreply.github.com>

bors · 2019-07-25T05:45:53Z

⌛ Testing commit 5647078 with merge c251000e85d71721c45b3283d30e386c5c8f320b...

bors · 2019-07-25T05:52:52Z

💔 Test failed - checks-azure

rust-highfive · 2019-07-25T05:52:53Z

Your PR failed (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.

2019-07-25T05:47:06.7894973Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-25T05:47:06.7895048Z 
2019-07-25T05:47:06.7895760Z   git checkout -b <new-branch-name>
2019-07-25T05:47:06.7895811Z 
2019-07-25T05:47:06.7896372Z HEAD is now at c251000e8 Auto merge of #62960 - Centril:rollup-8jay7g7, r=Centril
2019-07-25T05:47:06.8047994Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-25T05:47:06.8051164Z ==============================================================================
2019-07-25T05:47:06.8051491Z Task         : Bash
2019-07-25T05:47:06.8051559Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-25T05:50:25.4472717Z Script contents:
2019-07-25T05:50:25.4473102Z aws s3 cp --acl public-read cpu-usage.csv s3://$DEPLOY_BUCKET/rustc-builds/$BUILD_SOURCEVERSION/cpu-$SYSTEM_JOBNAME.csv
2019-07-25T05:50:25.4473402Z ========================== Starting Command Output ===========================
2019-07-25T05:50:25.4530194Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/13e94c2f-0e78-43be-9f5e-c1342dfe8235.sh
2019-07-25T05:50:25.4531230Z /home/vsts/work/_temp/13e94c2f-0e78-43be-9f5e-c1342dfe8235.sh: line 1: aws: command not found
2019-07-25T05:50:25.4532600Z ##[error]Bash exited with code '127'.
2019-07-25T05:50:25.4547330Z ##[section]Starting: Checkout
2019-07-25T05:50:25.4549011Z ==============================================================================
2019-07-25T05:50:25.4549114Z Task         : Get sources
2019-07-25T05:50:25.4549191Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 @TimNN. (Feature Requests)

Centril · 2019-07-25T05:54:06Z

@bors retry Spurious network.

bors · 2019-07-25T05:54:39Z

⌛ Testing commit 5647078 with merge fa5c15a1c525bb6f948db93c05dc758838a8493d...

rust-highfive · 2019-07-25T06:02:29Z

Your PR failed (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.

2019-07-25T05:57:17.0170549Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-25T05:57:17.0170651Z 
2019-07-25T05:57:17.0171074Z   git checkout -b <new-branch-name>
2019-07-25T05:57:17.0171178Z 
2019-07-25T05:57:17.0171651Z HEAD is now at fa5c15a1c Auto merge of #62960 - Centril:rollup-8jay7g7, r=Centril
2019-07-25T05:57:17.0365932Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-25T05:57:17.0369522Z ==============================================================================
2019-07-25T05:57:17.0369614Z Task         : Bash
2019-07-25T05:57:17.0369704Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-25T06:00:32.7706237Z Script contents:
2019-07-25T06:00:32.7706640Z aws s3 cp --acl public-read cpu-usage.csv s3://$DEPLOY_BUCKET/rustc-builds/$BUILD_SOURCEVERSION/cpu-$SYSTEM_JOBNAME.csv
2019-07-25T06:00:32.7732005Z ========================== Starting Command Output ===========================
2019-07-25T06:00:32.7749981Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/d3266e5d-f274-4d43-b947-e537dc6c1b7c.sh
2019-07-25T06:00:32.7825546Z /home/vsts/work/_temp/d3266e5d-f274-4d43-b947-e537dc6c1b7c.sh: line 1: aws: command not found
2019-07-25T06:00:32.7903098Z ##[error]Bash exited with code '127'.
2019-07-25T06:00:32.7937156Z ##[section]Starting: Checkout
2019-07-25T06:00:32.7939056Z ==============================================================================
2019-07-25T06:00:32.7939138Z Task         : Get sources
2019-07-25T06:00:32.7939229Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 @TimNN. (Feature Requests)

bors · 2019-07-25T06:02:42Z

💔 Test failed - checks-azure

Centril · 2019-07-25T06:05:51Z

@bors retry Spurious network?

bors · 2019-07-25T06:06:56Z

⌛ Testing commit 5647078 with merge 52089343d8f7b5058bb3585dc4f56c3883769f36...

rust-highfive · 2019-07-25T06:14:31Z

Your PR failed (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.

2019-07-25T06:09:19.0335438Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-25T06:09:19.0335491Z 
2019-07-25T06:09:19.0336118Z   git checkout -b <new-branch-name>
2019-07-25T06:09:19.0336160Z 
2019-07-25T06:09:19.0337340Z HEAD is now at 52089343d Auto merge of #62960 - Centril:rollup-8jay7g7, r=Centril
2019-07-25T06:09:19.0514670Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-25T06:09:19.0517908Z ==============================================================================
2019-07-25T06:09:19.0518020Z Task         : Bash
2019-07-25T06:09:19.0518244Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-25T06:12:18.8715932Z Script contents:
2019-07-25T06:12:18.8717733Z aws s3 cp --acl public-read cpu-usage.csv s3://$DEPLOY_BUCKET/rustc-builds/$BUILD_SOURCEVERSION/cpu-$SYSTEM_JOBNAME.csv
2019-07-25T06:12:18.8734861Z ========================== Starting Command Output ===========================
2019-07-25T06:12:18.8753756Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/5514c190-dee3-491e-9746-e51d16a9a880.sh
2019-07-25T06:12:18.8847772Z /home/vsts/work/_temp/5514c190-dee3-491e-9746-e51d16a9a880.sh: line 1: aws: command not found
2019-07-25T06:12:18.8881916Z ##[error]Bash exited with code '127'.
2019-07-25T06:12:18.8911543Z ##[section]Starting: Checkout
2019-07-25T06:12:18.8913252Z ==============================================================================
2019-07-25T06:12:18.8913366Z Task         : Get sources
2019-07-25T06:12:18.8913435Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 @TimNN. (Feature Requests)

bors · 2019-07-25T06:14:44Z

💔 Test failed - checks-azure

rust-highfive · 2019-07-25T08:05:33Z

The job LinuxTools of your PR failed (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.

2019-07-25T02:05:25.4200059Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-25T02:05:25.4439102Z ##[command]git config gc.auto 0
2019-07-25T02:05:25.4506758Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-25T02:05:25.4560065Z ##[command]git config --get-all http.proxy
2019-07-25T02:05:25.4698000Z ##[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/62960/merge:refs/remotes/pull/62960/merge
---
2019-07-25T02:05:59.5753472Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-25T02:05:59.5753740Z 
2019-07-25T02:05:59.5754161Z   git checkout -b <new-branch-name>
2019-07-25T02:05:59.5754330Z 
2019-07-25T02:05:59.5754535Z HEAD is now at 848e06b3b Merge 5647078b3181a1f54bc80a727b2c00a433d37bf5 into 03f19f7ff128a3b01eeab3f87f04cce22883f006
2019-07-25T02:05:59.5886710Z ##[section]Finishing: Checkout
2019-07-25T02:05:59.5892068Z ##[section]Starting: Decide whether to run this job
2019-07-25T02:05:59.5895842Z Task         : Bash
2019-07-25T02:05:59.5895888Z Description  : Run a Bash script on macOS, Linux, or Windows
2019-07-25T02:05:59.5895934Z Version      : 3.151.3
2019-07-25T02:05:59.5895996Z Author       : Microsoft Corporation
2019-07-25T02:05:59.5895996Z Author       : Microsoft Corporation
2019-07-25T02:05:59.5896047Z Help         : https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/bash
2019-07-25T02:05:59.5896097Z ==============================================================================
2019-07-25T02:05:59.7112108Z Generating script.
2019-07-25T02:05:59.7142353Z ========================== Starting Command Output ===========================
2019-07-25T02:05:59.7170921Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/8c27c8ce-1081-4580-8407-ba26aabcd7e2.sh
2019-07-25T02:06:00.0265006Z Executing the job since submodules are updated
2019-07-25T02:06:00.0346921Z ##[section]Finishing: Decide whether to run this job
2019-07-25T02:06:00.0356024Z ==============================================================================
2019-07-25T02:06:00.0356134Z Task         : Bash
2019-07-25T02:06:00.0356180Z Description  : Run a Bash script on macOS, Linux, or Windows
2019-07-25T02:06:00.0356229Z Version      : 3.151.3
---
2019-07-25T04:05:22.1981936Z Cloning into 'rust-toolstate'...
2019-07-25T04:05:22.8520030Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-25T04:05:22.8747787Z [master 0c78f61] (linux CI update)
2019-07-25T04:05:22.8748114Z  1 file changed, 1 insertion(+)
2019-07-25T04:05:23.5032009Z remote: Invalid username or password.
2019-07-25T04:05:23.5033798Z fatal: Authentication failed for 'https://github.com/rust-lang-nursery/rust-toolstate.git/'
2019-07-25T04:05:25.8148324Z  * branch            master     -> FETCH_HEAD
2019-07-25T04:05:25.8297685Z HEAD is now at c8d66de (windows CI update)
2019-07-25T04:05:25.8399473Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-25T04:05:25.8569580Z [master 63cd501] (linux CI update)
2019-07-25T04:05:25.8569580Z [master 63cd501] (linux CI update)
2019-07-25T04:05:25.8569826Z  1 file changed, 1 insertion(+)
2019-07-25T04:05:26.1676440Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-25T04:05:26.4794900Z  * branch            master     -> FETCH_HEAD
2019-07-25T04:05:26.4927622Z HEAD is now at c8d66de (windows CI update)
2019-07-25T04:05:26.5032433Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-25T04:05:26.5202207Z [master 904f54b] (linux CI update)
2019-07-25T04:05:26.5202207Z [master 904f54b] (linux CI update)
2019-07-25T04:05:26.5202805Z  1 file changed, 1 insertion(+)
2019-07-25T04:05:26.7982007Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-25T04:05:27.1111554Z  * branch            master     -> FETCH_HEAD
2019-07-25T04:05:27.1262988Z HEAD is now at c8d66de (windows CI update)
2019-07-25T04:05:27.1372924Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-25T04:05:27.1558066Z [master 4baa60e] (linux CI update)
2019-07-25T04:05:27.1558066Z [master 4baa60e] (linux CI update)
2019-07-25T04:05:27.1558140Z  1 file changed, 1 insertion(+)
2019-07-25T04:05:27.4460481Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-25T04:05:28.9160186Z  * branch            master     -> FETCH_HEAD
2019-07-25T04:05:28.9297017Z HEAD is now at c8d66de (windows CI update)
2019-07-25T04:05:28.9403378Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-25T04:05:28.9572688Z [master 3aa50b7] (linux CI update)
2019-07-25T04:05:28.9572688Z [master 3aa50b7] (linux CI update)
2019-07-25T04:05:28.9573306Z  1 file changed, 1 insertion(+)
2019-07-25T04:05:29.2581547Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-25T04:05:32.5690880Z  * branch            master     -> FETCH_HEAD
2019-07-25T04:05:32.5811812Z HEAD is now at c8d66de (windows CI update)
2019-07-25T04:05:32.5811812Z HEAD is now at c8d66de (windows CI update)
2019-07-25T04:05:33.6410980Z ##[error]Bash exited with code '1'.
2019-07-25T04:05:33.6446152Z ##[section]Starting: Checkout
2019-07-25T04:05:33.6448072Z ==============================================================================
2019-07-25T04:05:33.6448114Z Task         : Get sources
2019-07-25T04:05:33.6448163Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 @TimNN. (Feature Requests)

varkor and others added 30 commits July 1, 2019 00:52

Take substs into account in conservative_is_privately_uninhabited

962bf69

Remove obsolete “should not have to exist” reasons

5397dfc

Split the SliceConcat trait into Concat and Join

01d93bf

Take separator by value in [T]::join

283f676

Add joining slices of slices with a slice separator, not just a singl…

b62a77b

…e item

Update src/liballoc/slice.rs

d0635ee

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Update src/liballoc/slice.rs

bbc9366

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Update src/liballoc/str.rs

5f7768a

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

allow clippy::unreadable_literal in unicode tables

dee3d27

Also modifies the generation script to emit 2018 edition paths.

Remove support for -Zlower-128bit-ops

3427a14

It is broken and unused

Update compiler_builtins to 0.1.18

e8a1e73

warn that raw pointers must be aligned when used, and that writes cau…

21b502b

…se drop

references must be aligned; also move up the warning that fn ptrs mus…

2e6b13a

…t be non-NULL

Remove tests for -Zlower-128bit-ops

93de733

sync with nomicon: raw ptr must be non-dangling and aligned every tim…

f502bf7

…e it is dereferenced

apply feedback

4081222

weasle, weasle

a7b9246

account for non-drop-glue types

9196781

Fix building_llvm in sanity check, add swig sanity check.

f78cd4d

libsyntax: factor out file path resolving

ba78db3

This allows the same logic used by `include_X!` macros to be used by `#[doc(include)]`.

Make #[doc(include)] paths behave like other paths

138e08c

This makes them relative to the containing file instead of the crate root

Adjust docs to new #[doc(include)] behaviour

1cc7c21

stage0 -> bootstrap

8ccf52c

Make path::resolve a method on ExtCtxt

edb2187

Update stdarch submodule

7c42259

Apply suggestions from code review

dd5045e

Co-Authored-By: gnzlbg <gnzlbg@users.noreply.github.com>

word things more like we usually do

65cf10d

Update test

218ab4c

Disable d32 on armv6 hf targets

fe4cdd3

Initialize the MSP430 AsmParser if available

71717b9

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 Jul 25, 2019

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 Jul 25, 2019

Centril mentioned this pull request Jul 25, 2019

bump Miri #62944

Merged

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 Jul 25, 2019

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 Jul 25, 2019

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 Jul 25, 2019

Centril closed this Jul 25, 2019

Centril deleted the rollup-8jay7g7 branch July 25, 2019 08:33

pietroalbini mentioned this pull request Jul 25, 2019

Spurious failures when downloading awscli from PyPI #62967

Closed

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 13 pull requests #62960

Rollup of 13 pull requests #62960

Centril commented Jul 24, 2019

bors commented Jul 25, 2019

bors commented Jul 25, 2019

rust-highfive commented Jul 25, 2019

Centril commented Jul 25, 2019

bors commented Jul 25, 2019

rust-highfive commented Jul 25, 2019

bors commented Jul 25, 2019

Centril commented Jul 25, 2019

bors commented Jul 25, 2019

rust-highfive commented Jul 25, 2019

bors commented Jul 25, 2019

rust-highfive commented Jul 25, 2019

Rollup of 13 pull requests #62960

Rollup of 13 pull requests #62960

Conversation

Centril commented Jul 24, 2019

bors commented Jul 25, 2019

bors commented Jul 25, 2019

rust-highfive commented Jul 25, 2019

Centril commented Jul 25, 2019

bors commented Jul 25, 2019

rust-highfive commented Jul 25, 2019

bors commented Jul 25, 2019

Centril commented Jul 25, 2019

bors commented Jul 25, 2019

rust-highfive commented Jul 25, 2019

bors commented Jul 25, 2019

rust-highfive commented Jul 25, 2019