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 15 pull requests #65322

Merged
merged 49 commits into from
Oct 12, 2019
Merged

Rollup of 15 pull requests #65322

merged 49 commits into from
Oct 12, 2019

Conversation

tmandry
Copy link
Member

@tmandry tmandry commented Oct 11, 2019

Successful merges:

Failed merges:

r? @ghost

rick68 and others added 30 commits September 20, 2019 17:38
It was unclear what the implementation does when it encounters existing keys. This change makes it clear by documenting the trait impl.
This example failed to compile because of implicit `Sized` bound
for `A` parameter that wasn't required by `Trait`.
Updates LLVM to pick up the cherry-picked support for correctly
handling exception handling with aggregates passed by value. This will
be necessary to continue to support Emscripten's exception handling
once we switch using Emscripten's LLVM backend. See rust-lang#63649.
I've accidentally did `mut_path_buf.jon(a_path);`, expecting this to be an in-place modification. Seems like we can easily warn in such cases?
…-E0568, r=estebank

Add long error explanation for E0568

Part of rust-lang#61137.
…exceptions, r=nikic

Update LLVM for Emscripten exception handling support

Updates LLVM to pick up the cherry-picked support for correctly
handling exception handling with aggregates passed by value. This will
be necessary to continue to support Emscripten's exception handling
once we switch using Emscripten's LLVM backend. See rust-lang#63649.
…tril

Deduplicate is_{freeze,copy,sized}_raw

Fixes rust-lang#65259

Deduplicates `is_{freeze,copy,sized}_raw` by delegating to a new method which takes in a `LangItem`.
Mark Path::join as must_use

I've accidentally did `mut_path_buf.jon(a_path);`, expecting this to be an in-place modification. Seems like we can easily warn in such cases?
…mulacrum

Don't cc rust-lang/compiler for toolstate changes

Fixes rust-lang#65238.
stability: Do not use `buffer_lint` after lowering to HIR

Fixes rust-lang#65253
deriving: avoid dummy Span on an artificial `type_ident` path

The dummy Span pointed to the beginning of the source file instead to where the `#[derive]` is located. Later, it tripped the `in_derive_expansion(span)` check at `src/librustc/middle/stability.rs`, causing a span-less deprecation warning to be emitted.

Fixes rust-lang#56195, Fixes rust-lang#55417.
…f8-test, r=nikomatsakis

Remove painful test that is not pulling its weight

Research suggests that we are not properly testing this case anyway, and
even if we were, it is unlikely that we will regress here -- or, perhaps
more accurately, if we do, I am uncertain that we care too much. It
definitely seems like an edge case, and one that is particularly
unlikely to occur as time goes on.

Fixes rust-lang#63520
@tmandry
Copy link
Member Author

tmandry commented Oct 11, 2019

@bors r+ p=15 rollup=never

@bors
Copy link
Contributor

bors commented Oct 11, 2019

📌 Commit b93203f has been approved by tmandry

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

bors commented Oct 11, 2019

⌛ Testing commit b93203f with merge 632883eccb714e0ef4e913f905a30f8dd9e009cd...

@bors
Copy link
Contributor

bors commented Oct 12, 2019

💥 Test timed out

@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 12, 2019
@Centril
Copy link
Contributor

Centril commented Oct 12, 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 Oct 12, 2019
@bors
Copy link
Contributor

bors commented Oct 12, 2019

⌛ Testing commit b93203f with merge 026447b...

bors added a commit that referenced this pull request Oct 12, 2019
Rollup of 15 pull requests

Successful merges:

 - #64337 (libstd: Fix typos in doc)
 - #64986 (Function pointers as const generic arguments)
 - #65048 (Added doc about behavior of extend on HashMap)
 - #65191 (Add some regression tests)
 - #65200 (Add ?Sized bound to a supertrait listing in E0038 error documentation)
 - #65205 (Add long error explanation for E0568)
 - #65220 (Update LLVM for Emscripten exception handling support)
 - #65263 (Deduplicate is_{freeze,copy,sized}_raw)
 - #65266 (Mark Path::join as must_use)
 - #65276 (Don't cc rust-lang/compiler for toolstate changes)
 - #65277 (Query generator kind for error reporting)
 - #65283 (stability: Do not use `buffer_lint` after lowering to HIR)
 - #65289 (Fix suggested bound addition diagnostic)
 - #65310 (deriving: avoid dummy Span on an artificial `type_ident` path)
 - #65321 (Remove painful test that is not pulling its weight)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Oct 12, 2019

☀️ Test successful - checks-azure
Approved by: tmandry
Pushing 026447b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 12, 2019
@bors bors merged commit b93203f into rust-lang:master Oct 12, 2019
@Centril Centril added the rollup A PR which is a rollup label Oct 18, 2019
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.