Skip to content

Rollup of 10 pull requests - #70246

Merged
bors merged 21 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-vt9wex2
Mar 22, 2020
Merged

Rollup of 10 pull requests#70246
bors merged 21 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-vt9wex2

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

pnkfelixand others added 21 commits March 20, 2020 13:56
Namely, this version focuses on the end-to-end behavior that the attempt to
create the UDP binding will fail, regardless of the semantics of how particular
DNS servers handle junk inputs.
(I spent some time trying to create a second more-focused test that would
sidestep the DNS resolution, but this is not possible without more invasive
changes to the internal infrastructure of `ToSocketAddrs` and what not. It is
not worth it.)
Also stop encoding/decoding it entirely
…r=nikomatsakis
symbol_names: treat ReifyShim like VtableShim.
Without this, the `#[track_caller]` tests don't pass with `-Zsymbol-mangling-version=v0`, because there is a symbol name collision between the `ReifyShim` and the original definition.
cc @anp
…um_discr, r=RalfJung,eddyb
Fix ICE caused by truncating a negative ZST enum discriminant
Fixesrust-lang#70114
r? @oli-obk or @RalfJung
…-23076, r=LukasKalbertodt
For issue 53957: revise unit test to focus on underlying bug of 23076.
Fixrust-lang#53957 by revising unit test to focus on underlying bug of rust-lang#23076.
Namely, this version focuses on the end-to-end behavior that the attempt to create the UDP binding will fail, regardless of the semantics of how particular DNS servers handle junk inputs.
(I spent some time trying to create a second more-focused test that would sidestep the DNS resolution, but this is not possible without more invasive changes to the internal infrastructure of `ToSocketAddrs` and what not. It is not worth it.)
ast: Compress `AttrId` from `usize` to `u32`
An easy size win for `ast::Attribute` (96 bytes -> 88 bytes).
Also stop encoding/decoding `AttrId` entirely.
…, r=jonas-schievink
Fix deprecated Error.description() usage in docs
Tweak wording for std::io::Read::read function
I think the sentence as a whole reads smoother that way.
Add a test for out-of-line module passed through a proc macro
Closesrust-lang#58818.
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=10

@bors

bors commented Mar 21, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 17e6ed1 has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 21, 2020
@bors

bors commented Mar 21, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 17e6ed1 with merge c6b172f...

@Dylan-DPC-zzDylan-DPC-zz added the rollup A PR which is a rollup label Mar 21, 2020
@bors

bors commented Mar 22, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing c6b172f to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 22, 2020
@bors
bors merged commit c6b172f into rust-lang:masterMar 22, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

12 participants

@Dylan-DPC-zz@bors@EverlastingBugstopper@pnkfelix@petrochenkov@intgr@wesleywiser@eddyb@tesuji@adrian5@Zoxc@Dylan-DPC