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.

Sign up for GitHub

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

Jump to bottom

Rollup of 2 pull requests #65457

Closed
wants to merge 4 commits into from
Closed

Rollup of 2 pull requests #65457

wants to merge 4 commits into from

Conversation

tmandry
Copy link
Member

@tmandry tmandry commented Oct 16, 2019

Successful merges:

Failed merges:

r? @ghost

ehuss and others added 4 commits October 15, 2019 10:46
@ehuss
Update cargo, cc, books
611bdcc
@Manishearth
Update clippy
33543ed
@tmandry
Rollup merge of rust-lang#65445 - ehuss:update-cargo-books, r=alexcri…
9a7166b 
…chton

Update cargo, cc, books

Update `cc` to include new parallel building support.

## nomicon

3 commits in 4374786f0b4bf0606b35d5c30a9681f342e5707b..5004ad30d69f93553ceef74439fea2159d1f769e
2019-09-17 18:33:21 +0200 to 2019-10-12 19:52:40 +0200
- further clarify C11 and C/C++11 terminology (rust-lang/nomicon#169)
- atomics: C11 -> C++20 (rust-lang/nomicon#168)
- use sound/unsound terminology

## cargo

12 commits in a429e8cc4614a46a86322a0777a477e2baa83f1c..3a9abe3f065554a7fbc59f440df2baba4a6e47ee
2019-10-04 17:36:12 +0000 to 2019-10-15 15:55:35 +0000
- Fix typo in git index initialization error path (rust-lang/cargo#7512)
- Reject feature flags in a virtual workspace. (rust-lang/cargo#7507)
- Rename `overrides` to `package` in profiles. (rust-lang/cargo#7504)
- Allow publishing with dev-dependencies without a version. (rust-lang/cargo#7333)
- Stabilize cache-messages (rust-lang/cargo#7450)
- don't lock the package cache when cleaning target dir. (rust-lang/cargo#7502)
- Document rustc wrapper (rust-lang/cargo#7499)
- Migrate towards exclusively using serde for `Config` (rust-lang/cargo#7456)
- Re-enable some MSVC tests. (rust-lang/cargo#7492)
- when -Z unstable-options not specified, don't validate --profile (rust-lang/cargo#7489)
- Improve error message for cyclic dependencies (rust-lang/cargo#7470)
- Some minor clippy fixes. (rust-lang/cargo#7484)

## book

7 commits in 04806c80be0f54b1290287e3f85e84bdfc0b6ec7..9bb8b161963fcebc9d9ccd732ba26f42108016d5
2019-10-01 20:20:22 -0400 to 2019-10-14 18:42:55 -0500
- Make a portion of text less ambiguous (rust-lang/book#2092)
- fix heading level (rust-lang/book#2117)
- Add missing "of" before `"duck typing"`. (rust-lang/book#1951)
- ch18-03: no need to debug print destructured int (rust-lang/book#1991)
- Subtle fix to introduce ? on Option in Chapter 9.2 (rust-lang/book#2047)
- make wording clearer (rust-lang/book#1976)
- Update the version of rand we use

## rust-by-example

5 commits in a6288e7407a6c4c19ea29de6d43f40c803883f21..0b111eaae36cc4b4997684be853882a59e2c7ca7
2019-10-01 10:09:14 -0300 to 2019-10-14 18:34:25 -0300
- Some fix to three files (rust-lang/rust-by-example#1280)
- Add reference to Generics (rust-lang/rust-by-example#1281)
- Confusing and long sentence (rust-lang/rust-by-example#1282)
- Explicit mention of slice range meaning (rust-lang/rust-by-example#1277)
- Updated aliasing for nll (rust-lang/rust-by-example#1276)
@tmandry
Rollup merge of rust-lang#65450 - Manishearth:clippyup, r=Manishearth
2326eca 
Update clippy

Fixes rust-lang#65446.
r? @ghost
@tmandry
Copy link
Member Author

tmandry commented Oct 16, 2019

Bundling together submodule changes since they're roughly equal risk and we currently have 3 p=1 changes in the queue, one of which can't be rolled up.

@bors r+ p=2 rollup=never

@bors
Copy link
Contributor

bors commented Oct 16, 2019

📌 Commit 2326eca has been approved by tmandry

@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 Oct 16, 2019
@bors
Copy link
Contributor

bors commented Oct 16, 2019

⌛ Testing commit 2326eca with merge 6321db3...

bors added a commit that referenced this pull request Oct 16, 2019
@bors
Auto merge of #65457 - tmandry:rollup-y1fd3c6, r=tmandry
6321db3 
Rollup of 2 pull requests

Successful merges:

 - #65445 (Update cargo, cc, books)
 - #65450 (Update clippy)

Failed merges:

r? @ghost
@rust-highfive
Copy link
Collaborator

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. 
2019-10-16T03:17:04.4203046Z do so (now or later) by using -b with the checkout command again. Example:
2019-10-16T03:17:04.4203554Z 
2019-10-16T03:17:04.4204224Z   git checkout -b <new-branch-name>
2019-10-16T03:17:04.4204330Z 
2019-10-16T03:17:04.4204733Z HEAD is now at 6321db391 Auto merge of #65457 - tmandry:rollup-y1fd3c6, r=tmandry
2019-10-16T03:17:04.4590284Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-10-16T03:17:04.4698340Z ==============================================================================
2019-10-16T03:17:04.4698463Z Task         : Bash
2019-10-16T03:17:04.4698546Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-16T03:17:09.9542621Z 
2019-10-16T03:17:10.7318595Z   0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
2019-10-16T03:17:11.3047311Z   0 32.7M    0  304k    0     0   390k      0  0:01:25 --:--:--  0:01:25  390k
2019-10-16T03:17:11.3070049Z  64 32.7M   64 21.1M    0     0  15.6M      0  0:00:02  0:00:01  0:00:01 15.6M
2019-10-16T03:17:11.3070737Z curl: (56) OpenSSL SSL_read: error:1408F119:SSL routines:ssl3_get_record:decryption failed or bad record mac, errno 0
2019-10-16T03:17:11.3329671Z ##[error]Bash exited with code '56'.
2019-10-16T03:17:11.3681348Z ##[section]Starting: Upload CPU usage statistics
2019-10-16T03:17:11.3800765Z ==============================================================================
2019-10-16T03:17:11.3800876Z Task         : Bash
2019-10-16T03:17:11.3800957Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-16T03:17:11.6577660Z [command]"C:\Program Files\Git\bin\bash.exe" --noprofile --norc -c pwd
2019-10-16T03:17:11.6927039Z /d/a/_temp
2019-10-16T03:17:11.6998287Z ========================== Starting Command Output ===========================
2019-10-16T03:17:11.7006718Z [command]"C:\Program Files\Git\bin\bash.exe" --noprofile --norc /d/a/_temp/8f84171e-d159-4e1d-af7e-9a29993d2ef5.sh
2019-10-16T03:17:11.7700053Z /d/a/_temp/8f84171e-d159-4e1d-af7e-9a29993d2ef5.sh: line 1: aws: command not found
2019-10-16T03:17:11.7751406Z ##[error]Bash exited with code '127'.
2019-10-16T03:17:11.7822902Z ##[section]Starting: Checkout
2019-10-16T03:17:11.7929295Z ==============================================================================
2019-10-16T03:17:11.7929414Z Task         : Get sources
2019-10-16T03:17:11.7929506Z 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
Copy link
Contributor

bors commented Oct 16, 2019

💔 Test failed - checks-azure

@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 Oct 16, 2019
@tmandry
Copy link
Member Author

tmandry commented Oct 16, 2019

@bors retry

@bors 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 Oct 16, 2019
@tmandry tmandry added the A-spurious Area: Spurious failures in builds (spuriously == for no apparent reason) label Oct 16, 2019
@bors
Copy link
Contributor

bors commented Oct 16, 2019

⌛ Testing commit 2326eca with merge db51f5635f98745c20a0ef93f56438cbed272f9e...

@bors
Copy link
Contributor

bors commented Oct 16, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job dist-various-1 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. 
2019-10-16T04:49:50.7787658Z + python2.7 ../x.py dist --target asmjs-unknown-emscripten,wasm32-unknown-emscripten,x86_64-rumprun-netbsd,mips-unknown-linux-musl,mipsel-unknown-linux-musl,arm-unknown-linux-musleabi,arm-unknown-linux-musleabihf,armv5te-unknown-linux-gnueabi,armv5te-unknown-linux-musleabi,armv7-unknown-linux-musleabihf,aarch64-unknown-linux-musl,sparc64-unknown-linux-gnu,x86_64-unknown-redox,thumbv6m-none-eabi,thumbv7m-none-eabi,thumbv7em-none-eabi,thumbv7em-none-eabihf,thumbv8m.base-none-eabi,thumbv8m.main-none-eabi,thumbv8m.main-none-eabihf,riscv32i-unknown-none-elf,riscv32imc-unknown-none-elf,riscv32imac-unknown-none-elf,riscv64imac-unknown-none-elf,riscv64gc-unknown-none-elf,armebv7r-none-eabi,armebv7r-none-eabihf,armv7r-none-eabi,armv7r-none-eabihf,thumbv7neon-unknown-linux-gnueabihf
2019-10-16T04:49:51.0900214Z     Finished dev [unoptimized] target(s) in 0.22s
2019-10-16T04:49:51.1788747Z thread 'main' panicked at '
2019-10-16T04:49:51.1789747Z 
2019-10-16T04:49:51.1790316Z couldn't find required command: "riscv32-unknown-elf-gcc"
2019-10-16T04:49:51.1790676Z ', src/bootstrap/sanity.rs:57:13
2019-10-16T04:49:51.1790787Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-10-16T04:49:51.1834711Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --target asmjs-unknown-emscripten,wasm32-unknown-emscripten,x86_64-rumprun-netbsd,mips-unknown-linux-musl,mipsel-unknown-linux-musl,arm-unknown-linux-musleabi,arm-unknown-linux-musleabihf,armv5te-unknown-linux-gnueabi,armv5te-unknown-linux-musleabi,armv7-unknown-linux-musleabihf,aarch64-unknown-linux-musl,sparc64-unknown-linux-gnu,x86_64-unknown-redox,thumbv6m-none-eabi,thumbv7m-none-eabi,thumbv7em-none-eabi,thumbv7em-none-eabihf,thumbv8m.base-none-eabi,thumbv8m.main-none-eabi,thumbv8m.main-none-eabihf,riscv32i-unknown-none-elf,riscv32imc-unknown-none-elf,riscv32imac-unknown-none-elf,riscv64imac-unknown-none-elf,riscv64gc-unknown-none-elf,armebv7r-none-eabi,armebv7r-none-eabihf,armv7r-none-eabi,armv7r-none-eabihf,thumbv7neon-unknown-linux-gnueabihf
2019-10-16T04:49:51.1835153Z Build completed unsuccessfully in 0:00:00
2019-10-16T04:49:51.1835153Z Build completed unsuccessfully in 0:00:00
2019-10-16T04:49:51.1890117Z == clock drift check ==
2019-10-16T04:49:51.1905515Z   local time: Wed Oct 16 04:49:51 UTC 2019
2019-10-16T04:49:51.7318637Z   network time: Wed, 16 Oct 2019 04:49:51 GMT
2019-10-16T04:49:51.7322900Z == end clock drift check ==
2019-10-16T04:49:54.4106372Z ##[error]Bash exited with code '1'.
2019-10-16T04:49:54.4157741Z ##[section]Starting: Upload CPU usage statistics
2019-10-16T04:49:54.4163843Z ==============================================================================
2019-10-16T04:49:54.4163945Z Task         : Bash
2019-10-16T04:49:54.4164023Z Description  : Run a Bash script on macOS, Linux, or Windows

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 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 Oct 16, 2019
@tmandry tmandry mentioned this pull request Oct 16, 2019
Merged
@tmandry tmandry closed this Oct 16, 2019
@tmandry tmandry deleted the rollup-y1fd3c6 branch October 16, 2019 05:04
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-spurious Area: Spurious failures in builds (spuriously == for no apparent reason) rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@tmandry @bors @rust-highfive @Centril @ehuss @Manishearth