diff options
| author | bors <bors@rust-lang.org> | 2019-11-29 08:12:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-29 08:12:43 +0000 |
| commit | fe969f4ec67a5bd317818cbc7a648c5795af15fa (patch) | |
| tree | 5f7458527733b0fb162a198bf5006f084a6a86aa /src/libstd/sys/unix/stack_overflow.rs | |
| parent | 3907d59bcf6824f32bf9c91205f0c2dbcc467658 (diff) | |
| parent | 79fcaf8f12017fed25cb8f8f077a762408af8c9c (diff) | |
| download | rust-fe969f4ec67a5bd317818cbc7a648c5795af15fa.tar.gz rust-fe969f4ec67a5bd317818cbc7a648c5795af15fa.zip | |
Auto merge of #66590 - Aaron1011:fix/real-impl-trait-coherence, r=varkor
Apply proper commit from PR #63934 While working on PR #63934, I accidentally reverted to an older version of the PR while working on a rebase. The PR was then merged, not with the later, approved changes, but with earlier, unapproved changes. This PR applies the changes that were *suppoesd* to be mereged in PR #63934. All of the proper tests appear to have been merged in PR #63934, so this PR adds no new tests
Diffstat (limited to 'src/libstd/sys/unix/stack_overflow.rs')
0 files changed, 0 insertions, 0 deletions