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 4 pull requests #63134

Closed
wants to merge 12 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jul 30, 2019

Successful merges:

Failed merges:

r? @ghost

TankhouseAle and others added 12 commits July 29, 2019 22:57
This is a modified version of the test I added previously. The difference is this version implements a wrapper around std::any::type_name versus core::intrinsics::type_name, in order to show that it works as desired / intended.
Specifically the `#[rustc_const_unstable(feature = "const_type_name")]` attribute, as well as marking the actual function as `const`.
…=varkor

Turn `INCOMPLETE_FEATURES` into lint

We do this because it is annoying to see the warning when building rustc and because this is better from a "separation of concerns" POV.

The drawback to this change is that this will respect `--cap-lints`.
Also note that this is not a buffered lint so if there are fatal parser errors then the lint will not trigger.

r? @varkor
…, r=oli-obk

`const fn`-ify `std::any::type_name` as laid out in rust-lang#63084

A test, based on the one I added when I implemented support for the underlying `core::intrinsics::type_name` being allowed in `const fn` contexts, is included.
…-obk

Subslice patterns: Test passing static & dynamic semantics.

Working towards testing coverage for rust-lang#62254.
See https://github.com/rust-lang/rfcs/blob/master/text/2359-subslice-pattern-syntax.md for the RFC.

r? @oli-obk cc @petrochenkov
@Centril
Copy link
Contributor Author

Centril commented Jul 30, 2019

@bors r+ p=20 rollup=never

@bors
Copy link
Contributor

bors commented Jul 30, 2019

📌 Commit 10488da has been approved by Centril

@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 Jul 30, 2019
@bors
Copy link
Contributor

bors commented Jul 30, 2019

⌛ Testing commit 10488da with merge 3f5904afcd200fb21cd09566f838cb6c3c7498fd...

@bors
Copy link
Contributor

bors commented Jul 30, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job dist-x86_64-apple-alt 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-30T13:49:39.8692330Z [RUSTC-TIMING] git_rustfmt test:false 12.685
2019-07-30T13:49:41.4642870Z [RUSTC-TIMING] rustfmt test:false 14.284
2019-07-30T13:49:41.7453490Z [RUSTC-TIMING] cargo_fmt test:false 14.566
2019-07-30T13:49:41.7637720Z     Finished release [optimized] target(s) in 3m 12s
2019-07-30T13:49:41.8022060Z duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
2019-07-30T13:49:41.8022610Z 
2019-07-30T13:49:41.8022740Z the following dependencies are duplicated although they have the same features enabled:
2019-07-30T13:49:41.8023220Z the following dependencies have different features:
2019-07-30T13:49:41.8024190Z   crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)
2019-07-30T13:49:41.8025120Z     `rustfmt` additionally enabled features {"nightly"} at "/Users/vsts/agent/2.154.3/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libcrossbeam_utils-6c8cd67381bcfe02.rlib"
2019-07-30T13:49:41.8026150Z     `cargo` additionally enabled features {} at "/Users/vsts/agent/2.154.3/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libcrossbeam_utils-683657da3f16e5d0.rlib"
2019-07-30T13:49:41.8026300Z 
2019-07-30T13:49:41.8027090Z to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
2019-07-30T13:49:41.8027860Z thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:198:13
2019-07-30T13:49:41.8150070Z failed to run: /Users/vsts/agent/2.154.3/work/1/s/build/bootstrap/debug/bootstrap dist
2019-07-30T13:49:41.8150730Z Build completed unsuccessfully in 1:17:33
2019-07-30T13:49:41.8150730Z Build completed unsuccessfully in 1:17:33
2019-07-30T13:49:41.8467730Z ##[error]Bash exited with code '1'.
2019-07-30T13:49:41.8528950Z ##[section]Starting: Upload CPU usage statistics
2019-07-30T13:49:41.8562050Z ==============================================================================
2019-07-30T13:49:41.8562170Z Task         : Bash
2019-07-30T13:49:41.8562270Z 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 Jul 30, 2019
@Centril Centril closed this Jul 30, 2019
@Centril Centril deleted the rollup-1qsyqzb branch July 30, 2019 20:25
@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
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants