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 10 pull requests #65070

Closed
wants to merge 39 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 3, 2019

Successful merges:

Failed merges:

r? @ghost

Stjepan Glavina and others added 30 commits June 16, 2019 01:24
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
It's entirely irrelevant to crate loading
It's a crate name after renaming, so it's entirely irrelevant to crate loading
It was only used for retreiving edition, which was a bug.
In case of dual proc macros the edition should be taken from the target crate version, like any other metadata.
It duplicates `CrateRoot::name`
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
Co-Authored-By: Ralf Jung <post@ralfj.de>
Some comment refinements inspired by review feedback.
…oats

Stabilize todo macro

The `todo!` macro is just another name for `unimplemented!`.

Tracking issue: rust-lang#59277

This PR needs a FCP to merge.

r? @withoutboats
Deprecate `#![plugin]` & `#[plugin_registrar]`

This PR deprecates `#![plugin]` and `#[plugin_registrar]`.

~A removal deadline is set: 1.44.0. This will be in 9 months from now and should give everyone who is still relying on the feature ample time to rid themselves of this dependency.~

cc rust-lang#29597

r? @Mark-Simulacrum
…ure-doctests, r=QuietMisdreavus

Prevent rustdoc feature doctests

Part of rust-lang#61351

cc @ollie27
Replace mentions of IRC with Discord

Revival of rust-lang#61531

closes rust-lang#61524

what was the outcome of this? rust-lang#61531 (comment)

should this be changed in this PR as well? rust-lang#61531 (comment)
…arking-rust-abi-unwind-issue-64655, r=alexcrichton

Always mark rust and rust-call abi's as unwind

PR rust-lang#63909 identified a bug that had been injected by PR rust-lang#55982. As discussed on rust-lang#64655 (comment) , we started marking extern items as nounwind, *even* extern items that said they were using "Rust" or "rust-call" ABI.

This is a more targeted variant of PR rust-lang#63909 that fixes the above bug.

Fix rust-lang#64655

----

I personally suspect we will want PR rust-lang#63909 to land in the long-term

But:
 *  it is not certain that PR rust-lang#63909 *will* land,
 * more importantly, PR rust-lang#63909 almost certainly will not be backported to beta/stable.

The identified bug was more severe than I think anyone realized (apart from perhaps @gnzlbg, as noted [here](rust-lang#63909 (comment))).

Thus, I was motivated to write this PR, which fixes *just* the issue with extern rust/rust-call functions, and deliberately avoids injecting further deviation from current behavior (you can see further notes on this in the comments of the code added here).
metadata: Some crate loading cleanup

So, my goal was to fix caching of loaded crates which is broken and causes ICEs like rust-lang#56935 or rust-lang#64450.
While investigating I found that the code is pretty messy and likes to confuse various things that look similar but are actually different.
This PR does some initial cleanup in that area, I hope to get to the caching itself a bit later.
…-E0556, r=petrochenkov

Add long error explanation for E0556

Part of rust-lang#61137
@Centril
Copy link
Contributor Author

Centril commented Oct 3, 2019

@bors r+ p=10 rollup=never

@bors
Copy link
Contributor

bors commented Oct 3, 2019

📌 Commit dd97e17 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 Oct 3, 2019
@bors
Copy link
Contributor

bors commented Oct 3, 2019

⌛ Testing commit dd97e17 with merge 53574d6406f33fa152e43caf2730ca496df6d46a...

@bors
Copy link
Contributor

bors commented Oct 3, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job dist-powerpc64-linux 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-03T20:59:16.7292508Z    Compiling arena v0.0.0 (/checkout/src/libarena)
2019-10-03T20:59:17.1747966Z [RUSTC-TIMING] arena test:false 0.440
2019-10-03T20:59:17.1792999Z    Compiling syntax_pos v0.0.0 (/checkout/src/libsyntax_pos)
2019-10-03T20:59:17.2366833Z [RUSTC-TIMING] tempfile test:false 3.615
2019-10-03T20:59:17.2399764Z error: /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/release/deps/librustc_macros-f9c41f60c3e440f1.so: undefined symbol: __rustc_proc_macro_decls_7b3f997c3f27a6e9835a42bc866723ac__
2019-10-03T20:59:17.2400170Z  --> src/libsyntax_pos/symbol.rs:8:5
2019-10-03T20:59:17.2400682Z 8 | use rustc_macros::symbols;
2019-10-03T20:59:17.2401305Z   |     ^^^^^^^^^^^^
2019-10-03T20:59:17.2401359Z 
2019-10-03T20:59:17.2417103Z error: aborting due to previous error
---
2019-10-03T20:59:17.2617578Z == clock drift check ==
2019-10-03T20:59:17.2630921Z   local time: Thu Oct  3 20:59:17 UTC 2019
2019-10-03T20:59:17.4106937Z   network time: Thu, 03 Oct 2019 20:59:17 GMT
2019-10-03T20:59:17.4114088Z == end clock drift check ==
2019-10-03T20:59:19.0974127Z ##[error]Bash exited with code '1'.
2019-10-03T20:59:19.1018285Z ##[section]Starting: Upload CPU usage statistics
2019-10-03T20:59:19.1025990Z ==============================================================================
2019-10-03T20:59:19.1026123Z Task         : Bash
2019-10-03T20:59:19.1026221Z 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 3, 2019
@Centril Centril closed this Oct 3, 2019
@Centril Centril deleted the rollup-1qoz4c2 branch October 3, 2019 21:02
@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.

9 participants