Skip to content

Substitute erased lifetimes on bad placeholder type#82494

Merged
bors merged 1 commit intorust-lang:masterfrom
estebank:issue-82455
Feb 27, 2021
Merged

Substitute erased lifetimes on bad placeholder type#82494
bors merged 1 commit intorust-lang:masterfrom
estebank:issue-82455

Conversation

@estebank
Copy link
Contributor

@estebank estebank commented Feb 24, 2021

Fix #82455.

@estebank estebank added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Feb 24, 2021
@rust-highfive
Copy link
Contributor

rust-highfive commented Feb 24, 2021

r? @petrochenkov

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 24, 2021
@apiraino apiraino added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed stable-nominated Nominated for backporting to the compiler in the stable channel. labels Feb 25, 2021
@petrochenkov
Copy link
Contributor

petrochenkov commented Feb 25, 2021

Looks reasonable although I'm not sure whether the fix is complete and there are no other cases.
@bors r+

@bors
Copy link
Collaborator

bors commented Feb 25, 2021

📌 Commit 5ad6088 has been approved by petrochenkov

@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 Feb 25, 2021
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Feb 27, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 27, 2021
@bors
Auto merge of rust-lang#82577 - Dylan-DPC:rollup-c3si8ju, r=Dylan-DPC
9fa580b 
Rollup of 14 pull requests

Successful merges:

 - rust-lang#81794 (update tracking issue for `relaxed_struct_unsize`)
 - rust-lang#82057 (Replace const_cstr with cstr crate)
 - rust-lang#82370 (Improve anonymous lifetime note to indicate the target span)
 - rust-lang#82394 (:arrow_up: rust-analyzer)
 - rust-lang#82396 (Add Future trait for doc_spotlight feature doc)
 - rust-lang#82404 (Test hexagon-enum only when llvm target is present)
 - rust-lang#82419 (expand: Preserve order of inert attributes during expansion)
 - rust-lang#82420 (Enable API documentation for `std::os::wasi`.)
 - rust-lang#82421 (Add a `size()` function to WASI's `MetadataExt`.)
 - rust-lang#82442 (Skip emitting closure diagnostic when closure_kind_origins has no entry)
 - rust-lang#82473 (Use libc::accept4 on Android instead of raw syscall.)
 - rust-lang#82482 (Use small hash set in `mir_inliner_callees`)
 - rust-lang#82490 (Update cargo)
 - rust-lang#82494 (Substitute erased lifetimes on bad placeholder type)

Failed merges:

 - rust-lang#82448 (Combine HasAttrs and HasTokens into AstLike)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 95b31cf into rust-lang:master Feb 27, 2021
@rustbot rustbot added this to the 1.52.0 milestone Feb 27, 2021
This was referenced Feb 28, 2021
Closed
Closed
@estebank
Copy link
Contributor Author

estebank commented Mar 1, 2021

I'm not sure whether the fix is complete and there are no other cases.

I did a global search for all the places that handle _ in types. These were the only two places I could find that would require this. There was a third place that already handled it.

@cuviper cuviper mentioned this pull request Mar 11, 2021
Merged
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 11, 2021
@cuviper cuviper modified the milestones: 1.52.0, 1.51.0 Mar 11, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2021
@bors
Auto merge of rust-lang#82996 - cuviper:beta-next, r=Mark-Simulacrum
50b9553 
[beta] backports

This backports some beta-accepted PRs and one additional LLVM fix for s390x.

- rustdoc: treat edition 2021 as unstable rust-lang#82207
- Fix popping singleton paths in when generating E0433 rust-lang#82259
- libtest: Fix unwrap panic on duplicate TestDesc rust-lang#82274
- [intra-doc links] Don't check feature gates of items re-exported across crates rust-lang#82295
- rustdoc: Remove duplicate "List of all items" rust-lang#82484
- Substitute erased lifetimes on bad placeholder type rust-lang#82494
- Revert LLVM D81803 because it broke Windows 7 rust-lang#82605
- [SystemZ] Assign the full space for promoted and split outgoing args. rust-lang/llvm-project#95

r? `@Mark-Simulacrum`
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Apr 28, 2021
@m-ou-se
Rollup merge of rust-lang#84646 - JohnTitor:add-some-bad-placeholder-…
70fe449 
…tests, r=Dylan-DPC

Add some regression tests related to rust-lang#82494

Closes rust-lang#75883, closes rust-lang#80779
r? `@estebank`
@m-ou-se m-ou-se mentioned this pull request Apr 28, 2021
Closed
jackh726 added a commit to jackh726/rust that referenced this pull request Apr 28, 2021
@jackh726
Rollup merge of rust-lang#84646 - JohnTitor:add-some-bad-placeholder-…
fc081c4 
…tests, r=Dylan-DPC

Add some regression tests related to rust-lang#82494

Closes rust-lang#75883, closes rust-lang#80779
r? ``@estebank``
@jackh726 jackh726 mentioned this pull request Apr 28, 2021
Closed
jackh726 added a commit to jackh726/rust that referenced this pull request Apr 29, 2021
@jackh726
Rollup merge of rust-lang#84646 - JohnTitor:add-some-bad-placeholder-…
a3403fb 
…tests, r=Dylan-DPC

Add some regression tests related to rust-lang#82494

Closes rust-lang#75883, closes rust-lang#80779
r? ```@estebank```
@jackh726 jackh726 mentioned this pull request Apr 29, 2021
Closed
jackh726 added a commit to jackh726/rust that referenced this pull request Apr 29, 2021
@jackh726
Rollup merge of rust-lang#84646 - JohnTitor:add-some-bad-placeholder-…
96c2316 
…tests, r=Dylan-DPC

Add some regression tests related to rust-lang#82494

Closes rust-lang#75883, closes rust-lang#80779
r? ````@estebank````
@jackh726 jackh726 mentioned this pull request Apr 29, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 29, 2021
@bors
Auto merge of rust-lang#84684 - jackh726:rollup-qxc5cos, r=jackh726
d337cec 
Rollup of 11 pull requests

Successful merges:

 - rust-lang#84484 (Don't rebuild rustdoc and clippy after checking bootstrap)
 - rust-lang#84530 (`test tidy` should ignore alternative `build` dir patterns)
 - rust-lang#84531 (Ignore commented out lines when finding features)
 - rust-lang#84540 (Build sanitizers for x86_64-unknown-linux-musl)
 - rust-lang#84555 (Set `backtrace-on-ice` by default for compiler and codegen profiles)
 - rust-lang#84585 (Add `x.py check src/librustdoc` as an alias for `x.py check src/tools/rustdoc`)
 - rust-lang#84636 (rustdoc: change aliases attribute to data-aliases)
 - rust-lang#84646 (Add some regression tests related to rust-lang#82494)
 - rust-lang#84661 (Remove extra word in `rustc_mir` docs)
 - rust-lang#84663 (Remove `DropGuard` in `sys::windows::process` and use `StaticMutex` instead)
 - rust-lang#84668 (Update books)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@petrochenkov petrochenkov

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.51.0

Development

Successfully merging this pull request may close these issues.

Compiler panic with incorrect JoinHandle in thread_local var

7 participants

@estebank @rust-highfive @petrochenkov @bors @cuviper @apiraino @rustbot