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.

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

Rollup of 9 pull requests #66908

Merged
merged 42 commits into from
Dec 1, 2019
Merged

Rollup of 9 pull requests #66908

merged 42 commits into from
Dec 1, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Nov 30, 2019

Successful merges:

Failed merges:

r? @ghost

Nadrieril and others added 30 commits November 21, 2019 18:45
LLVM exposes a C API `LLVMAddAnalysisPasses` and hence Rust's own
wrapper `LLVMRustAddAnalysisPasses` is not needed anymore.
These three lines are from c82da7a in
2015.

They cause problems when applying rustfmt to the codebase, because
reordering wildcard imports can trigger new unused import warnings.

As a minimized example, the following program compiles successfully:

    #![deny(unused_imports)]

    use std::fmt::Debug;
    use std::marker::Send;

    pub mod repro {
        use std::prelude::v1::*;
        use super::*;

        pub type D = dyn Debug;
        pub type S = dyn Send;
    }

    pub type S = dyn Send;

but putting it through rustfmt produces a program that fails to compile:

    #![deny(unused_imports)]

    use std::fmt::Debug;
    use std::marker::Send;

    pub mod repro {
        use super::*;
        use std::prelude::v1::*;

        pub type D = dyn Debug;
        pub type S = dyn Send;
    }

    pub type S = dyn Send;

The error is:

    error: unused import: `std::prelude::v1::*`
     --> src/main.rs:8:9
      |
    8 |     use std::prelude::v1::*;
      |         ^^^^^^^^^^^^^^^^^^^
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 30, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Nov 30, 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 Nov 30, 2019
@bors
Copy link
Contributor

bors commented Nov 30, 2019

⌛ Testing commit b772b5b with merge 4f9a6522f8e90295fe9551480039e0bb201d4eae...

@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-11-30T18:42:35.6714342Z do so (now or later) by using -b with the checkout command again. Example:
2019-11-30T18:42:35.6714649Z 
2019-11-30T18:42:35.6714835Z   git checkout -b <new-branch-name>
2019-11-30T18:42:35.6715031Z 
2019-11-30T18:42:35.6715216Z HEAD is now at 4f9a6522f Auto merge of #66908 - Centril:rollup-26givp6, r=Centril
2019-11-30T18:42:35.7259895Z ##[section]Starting: Setup environment
2019-11-30T18:42:35.7386962Z ==============================================================================
2019-11-30T18:42:35.7387077Z Task         : Bash
2019-11-30T18:42:35.7387168Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-11-30T18:42:37.4934742Z 
2019-11-30T18:42:37.4934848Z 
2019-11-30T18:42:37.4934953Z 
2019-11-30T18:42:37.4935287Z  - #66612 (Initial implementation of or-pattern usefulness checking)
2019-11-30T18:42:37.4935474Z  - #66705 (Atomic as_mut_ptr)
2019-11-30T18:42:37.4935624Z  - #66759 (impl TrustedLen for vec::Drain)
2019-11-30T18:42:37.4936138Z  - #66858 (Use LLVMAddAnalysisPasses instead of Rust's wrapper)
2019-11-30T18:42:37.4936736Z  - #66870 (SimplifyArmIdentity only for locals with the same type)
2019-11-30T18:42:37.4941089Z  - #66883 (rustc_typeck: gate AnonConst's generics on feature(const_generics).)
2019-11-30T18:42:37.4941480Z  - #66889 (Make python-generated source files compatible with rustfmt)
2019-11-30T18:42:37.4941753Z  - #66894 (Remove unneeded prelude imports in libcore tests)
2019-11-30T18:42:37.4952643Z  - #66895 (Feature gating *declarations* => new crate `rustc_feature`)
2019-11-30T18:42:37.4954166Z AGENT_BUILDDIRECTORY=D:\a\1
2019-11-30T18:42:37.4954441Z AGENT_DISABLELOGPLUGIN_TESTFILEPUBLISHERPLUGIN=true
2019-11-30T18:42:37.4954636Z AGENT_DISABLELOGPLUGIN_TESTRESULTLOGPLUGIN=true
2019-11-30T18:42:37.4954802Z AGENT_HOMEDIRECTORY=C:\agents\2.160.1
---
2019-11-30T18:42:37.4966070Z BUILD_SOURCEBRANCHNAME=auto
2019-11-30T18:42:37.4966216Z BUILD_SOURCESDIRECTORY=D:\a\1\s
2019-11-30T18:42:37.4966393Z BUILD_SOURCEVERSION=4f9a6522f8e90295fe9551480039e0bb201d4eae
2019-11-30T18:42:37.4966678Z BUILD_SOURCEVERSIONAUTHOR=bors
2019-11-30T18:42:37.4967504Z BUILD_SOURCEVERSIONMESSAGE=Auto merge of #66908 - Centril:rollup-26givp6, r=Centril
2019-11-30T18:42:37.4968010Z CI_JOB_NAME=x86_64-mingw-1
2019-11-30T18:42:37.4968186Z COBERTURA_HOME=C:\cobertura-2.1.1
2019-11-30T18:42:37.4968373Z COMMONPROGRAMFILES=C:\Program Files\Common Files
2019-11-30T18:42:37.4968546Z COMMON_TESTRESULTSDIRECTORY=D:\a\1\TestResults
---
2019-11-30T18:43:46.6358628Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-11-30T18:43:46.6359047Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-11-30T18:43:46.6363442Z 
2019-11-30T18:43:46.6368645Z Failures
2019-11-30T18:43:46.6375539Z  - msys2 (exited 1) - msys2 not installed. An error occurred during installation:
2019-11-30T18:43:46.6376006Z  The remote server returned an error: (503) Server Unavailable. Service Unavailable
2019-11-30T18:43:47.1217355Z 
2019-11-30T18:43:47.1299970Z ##[error]Bash exited with code '1'.
2019-11-30T18:43:47.1442809Z ##[section]Starting: Checkout
2019-11-30T18:43:47.1544996Z ==============================================================================
2019-11-30T18:43:47.1545213Z Task         : Get sources
2019-11-30T18:43:47.1545300Z 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 Nov 30, 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 Nov 30, 2019
@RalfJung
Copy link
Member

RalfJung commented Dec 1, 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 Dec 1, 2019
@bors
Copy link
Contributor

bors commented Dec 1, 2019

⌛ Testing commit b772b5b with merge 135ccba...

bors added a commit that referenced this pull request Dec 1, 2019
Rollup of 9 pull requests

Successful merges:

 - #66612 (Initial implementation of or-pattern usefulness checking)
 - #66705 (Atomic as_mut_ptr)
 - #66759 (impl TrustedLen for vec::Drain)
 - #66858 (Use LLVMAddAnalysisPasses instead of Rust's wrapper)
 - #66870 (SimplifyArmIdentity only for locals with the same type)
 - #66883 (rustc_typeck: gate AnonConst's generics on feature(const_generics).)
 - #66889 (Make python-generated source files compatible with rustfmt)
 - #66894 (Remove unneeded prelude imports in libcore tests)
 - #66895 (Feature gating *declarations* => new crate `rustc_feature`)

Failed merges:

 - #66905 (rustc_plugin: Remove some remaining plugin features)

r? @ghost
@bors
Copy link
Contributor

bors commented Dec 1, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 135ccba to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.