Rollup of 8 pull requests #50449

kennytm · 2018-05-04T17:37:07Z

Successful merges:

save-analysis: handle aliasing imports a bit more nicely #50399 (save-analysis: handle aliasing imports a bit more nicely)
Add mailmap entry for Chris Vittal #50420 (Add mailmap entry for Chris Vittal)
Add armv5te-unknown-linux-musl target #50423 (Add armv5te-unknown-linux-musl target)
update books for the next release #50427 (update books for the next release)
Ping infra team on all tool bustage #50434 (Ping infra team on all tool bustage)
Add a CI job that makes sure rustc builds with parallel queries enabled. #50444 (Add a CI job that makes sure rustc builds with parallel queries enabled.)
Fix update-references for tests within subdirectories. #50447 (Fix update-references for tests within subdirectories.)
Update clippy #50448 (Update clippy)

Failed merges:

I use both Chris and Christopher in git configs and other places.

…PRs.

Fixes rust-lang#50438. I'll make this more robust later for rust-lang#49815.

@eddyb

save-analysis: handle aliasing imports a bit more nicely r? @eddyb

…oli-obk Add mailmap entry for Chris Vittal I use both Chris and Christopher in git configs and other places.

…l, r=alexcrichton Add armv5te-unknown-linux-musl target This PR adds the armv5te-unknown-linux-musl target. The following steps should let you produce a fully statically linked binary now: 1. Running `./src/ci/docker/run.sh dist-armv5te-linux-musl` 2. Changing the run.sh script to start bash instead of the build process and running the container 3. ```sh export USER=root export PATH=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin:$PATH ``` 4. Configuring Cargo ```yaml [target.armv5te-unknown-linux-musl] linker = "arm-linux-gnueabi-gcc" ``` 5. Building a project ```sh cargo new --bin hello cd hello cargo build --target=armv5te-unknown-linux-musl --release ```

update books for the next release

@kennytm

Ping infra team on all tool bustage r? @kennytm cc @rust-lang/core as discussed at today's meeting

@Zoxc

…ries-in-ci, r=alexcrichton Add a CI job that makes sure rustc builds with parallel queries enabled. This shouldn't take up too much CI time `:)` cc rust-lang#48607 cc @Zoxc r? @alexcrichton

…crichton Fix update-references for tests within subdirectories. Fixes rust-lang#50438. I'll make this more robust later for rust-lang#49815.

@Manishearth

Update clippy r? @Manishearth

rust-highfive · 2018-05-04T17:37:10Z

r? @petrochenkov

(rust_highfive has picked a reviewer for you, use r? to override)

rust-highfive · 2018-05-04T17:37:11Z

Warning

These commits modify submodules.

kennytm · 2018-05-04T17:37:26Z

@bors r+ p=8

bors · 2018-05-04T17:37:27Z

📌 Commit 6a1858a has been approved by kennytm

bors · 2018-05-04T17:44:54Z

⌛ Testing commit 6a1858a with merge 51a1e69c11df2a28eac8e343e4a5e54fe4f207d4...

bors · 2018-05-04T19:02:07Z

💔 Test failed - status-appveyor

kennytm · 2018-05-04T19:33:52Z

Failed to build RLS. Likely caused by #50448. The rest of the PRs are all at the back of the queue, thus closing.

[01:07:15] error[E0463]: can't find crate for `rustc_const_math`
[01:07:15]   --> C:\Users\appveyor\.cargo\registry\src\gitproxy.zycloud.tk-1ecc6299db9ec823\clippy_lints-0.0.195\src\lib.rs:41:1
[01:07:15]    |
[01:07:15] 41 | extern crate rustc_const_math;
[01:07:15]    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate
[01:07:15] 
[01:07:15] error: aborting due to previous error
[01:07:15] 
[01:07:15] For more information about this error, try `rustc --explain E0463`.
[01:07:15] [RUSTC-TIMING] clippy_lints test:false 1.479
[01:07:15] error: Could not compile `clippy_lints`.
[01:07:15] 
[01:07:15] Caused by:
[01:07:15]   process didn't exit successfully: `C:\projects\rust\build\bootstrap/debug/rustc --crate-name clippy_lints C:\Users\appveyor\.cargo\registry\src\gitproxy.zycloud.tk-1ecc6299db9ec823\clippy_lints-0.0.195\src\lib.rs --color always --error-format json --crate-type lib --emit=dep-info,link -C opt-level=3 -C metadata=f034645c1cef2be5 -C extra-filename=-f034645c1cef2be5 --out-dir C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps --target x86_64-pc-windows-msvc -L dependency=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps -L dependency=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\release\deps --extern pulldown_cmark=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\libpulldown_cmark-a0b0aaf454852239.rlib --extern quine_mc_cluskey=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\libquine_mc_cluskey-92221a71029eb882.rlib --extern url=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\liburl-d6e8656eb2fa755b.rlib --extern regex_syntax=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\libregex_syntax-e7ec8710b24436c4.rlib --extern if_chain=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\libif_chain-2d9ae78132625b27.rlib --extern unicode_normalization=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\libunicode_normalization-6989f445ddc87a84.rlib --extern semver=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\libsemver-325d1ba6e49fa23c.rlib --extern itertools=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\libitertools-e06725263431b900.rlib --extern serde_derive=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\release\deps\serde_derive-1e2188502da7e9f0.dll --extern lazy_static=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\liblazy_static-56230eaac815c346.rlib --extern serde=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\libserde-fdab64f98513f90c.rlib --extern toml=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\libtoml-3311258f5e47c7f5.rlib --extern matches=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\libmatches-d3dda493b0e1b7b5.rlib --cap-lints allow` (exit code: 101)
[01:07:15] warning: build failed, waiting for other jobs to finish...
[01:07:19] [RUSTC-TIMING] rayon test:false 4.934
[01:07:33] [RUSTC-TIMING] rustc_target test:false 19.163
[01:08:04] error: build failed
[01:08:04] command did not execute successfully: "C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0/bin\\cargo.exe" "build" "--target" "x86_64-pc-windows-msvc" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "C:\\projects\\rust\\src/tools/rls\\Cargo.toml" "--features" "clippy" "--message-format" "json"
[01:08:04] expected success, got: exit code: 101
[01:08:04] [TIMING] ToolBuild { compiler: Compiler { stage: 2, host: "x86_64-pc-windows-msvc" }, target: "x86_64-pc-windows-msvc", tool: "rls", path: "src/tools/rls", mode: Librustc, is_ext_tool: true, extra_features: ["clippy"] } -- 299.140
[01:08:04] failed to test rls: could not build

Nick Cameron and others added 18 commits May 3, 2018 10:24

save-analysis: handle aliasing imports a bit more nicely

7b378b2

Add mailmap entry for Chris Vittal

2797fef

I use both Chris and Christopher in git configs and other places.

Add armv5te-unknown-linux-musl target

b71f636

Ping infra team on all tool bustage

28dfc07

update books for the next release

1ae2668

Check that rustc can be built successfully with parallel queries for …

58eeeb4

…PRs.

Add eabi suffix to armv5te musl target

80f1912

Merge armv5te musl container with dist-various-1

235af75

Fix update-references for tests within subdirectories.

ab3b816

Fixes rust-lang#50438. I'll make this more robust later for rust-lang#49815.

Update clippy

cfaa8fe

Rollup merge of rust-lang#50399 - nrc:alias, r=eddyb

6cdcd5c

save-analysis: handle aliasing imports a bit more nicely r? @eddyb

Rollup merge of rust-lang#50420 - chrisvittal:mailmap-chrisvittal, r=…

fb923ec

…oli-obk Add mailmap entry for Chris Vittal I use both Chris and Christopher in git configs and other places.

Rollup merge of rust-lang#50427 - steveklabnik:update-books, r=oli-obk

795bd46

update books for the next release

Rollup merge of rust-lang#50434 - nrc:tool-bustage-infra, r=alexcrichton

7bde9e7

Ping infra team on all tool bustage r? @kennytm cc @rust-lang/core as discussed at today's meeting

Rollup merge of rust-lang#50444 - michaelwoerister:check-parallel-que…

c5b5802

…ries-in-ci, r=alexcrichton Add a CI job that makes sure rustc builds with parallel queries enabled. This shouldn't take up too much CI time `:)` cc rust-lang#48607 cc @Zoxc r? @alexcrichton

Rollup merge of rust-lang#50447 - ehuss:fix-update-references, r=alex…

f47ec3c

…crichton Fix update-references for tests within subdirectories. Fixes rust-lang#50438. I'll make this more robust later for rust-lang#49815.

Rollup merge of rust-lang#50448 - oli-obk:clippy, r=Manishearth

6a1858a

Update clippy r? @Manishearth

rust-highfive assigned petrochenkov May 4, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 4, 2018

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 4, 2018

kennytm unassigned petrochenkov May 4, 2018

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 4, 2018

kennytm closed this May 4, 2018

kennytm mentioned this pull request May 4, 2018

Update clippy #50448

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

Uh oh!

Uh oh!

Rollup of 8 pull requests #50449

Rollup of 8 pull requests #50449

Uh oh!

kennytm commented May 4, 2018

Uh oh!

rust-highfive commented May 4, 2018

Uh oh!

rust-highfive commented May 4, 2018

Uh oh!

kennytm commented May 4, 2018

Uh oh!

bors commented May 4, 2018

Uh oh!

bors commented May 4, 2018

Uh oh!

bors commented May 4, 2018

Uh oh!

kennytm commented May 4, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Rollup of 8 pull requests #50449

Rollup of 8 pull requests #50449

Uh oh!

Conversation

kennytm commented May 4, 2018

Uh oh!

rust-highfive commented May 4, 2018

Uh oh!

rust-highfive commented May 4, 2018

Uh oh!

kennytm commented May 4, 2018

Uh oh!

bors commented May 4, 2018

Uh oh!

bors commented May 4, 2018

Uh oh!

bors commented May 4, 2018

Uh oh!

kennytm commented May 4, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants