8000 [beta] backport rollup by Mark-Simulacrum · Pull Request #107071 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

[beta] backport rollup #107071

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Jan 20, 2023
Merged

[beta] backport rollup #107071

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
62173f9
Revert "Make nested RPITIT inherit the parent opaque's generics." and…
compiler-errors Jan 12, 2023
2081de9
fix `SyncSender` spinning behavior
ibraheemdev Jan 11, 2023
56fc5ff
add `SyncSender::send_timeout` test
ibraheemdev Jan 11, 2023
68da673
rework and document backoff behavior of `sync::mpsc`
ibraheemdev Jan 12, 2023
26c3226
rustdoc: fix outdated lint section of the book
notriddle Jan 8, 2023
f099871
Do not filter substs in `remap_generic_params_to_declaration_params`.
cjgillot Jan 5, 2023
5fdce89
Correct detection of elided lifetimes in impl-trait.
cjgillot Jan 5, 2023
d2f7d92
Bump rust-installer
Mark-Simulacrum Dec 27, 2022
8669f7e
Don't panic on stable since miri is not available there
oli-obk Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Revert "Make nested RPITIT inherit the parent opaque's generics." and… 
… adjust test

This reverts commit e2d41f4.
  • Loading branch information
@compiler-errors @Mark-Simulacrum
compiler-errors authored and Mark-Simulacrum committed Jan 19, 2023
commit 62173f97b2457ada5942d8dcf6ce5bcf5131a0b4
16 changes: 15 additions & 1 deletion compiler/rustc_hir_analysis/src/collect/generics_of.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use hir::{
GenericParamKind, HirId, Node,
};
use rustc_hir as hir;
use rustc_hir::def::DefKind;
use rustc_hir::def_id::DefId;
use rustc_middle::ty::{self, TyCtxt};
use rustc_session::lint;
Expand Down Expand Up @@ -142,7 +143,20 @@ pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: DefId) -> ty::Generics {
Some(tcx.typeck_root_def_id(def_id))
}
Node::Item(item) => match item.kind {
ItemKind::OpaqueTy(hir::OpaqueTy { .. }) => {
ItemKind::OpaqueTy(hir::OpaqueTy {
origin:
hir::OpaqueTyOrigin::FnReturn(fn_def_id) | hir::OpaqueTyOrigin::AsyncFn(fn_def_id),
in_trait,
..
}) => {
if in_trait {
assert!(matches!(tcx.def_kind(fn_def_id), DefKind::AssocFn))
} else {
assert!(matches!(tcx.def_kind(fn_def_id), DefKind::AssocFn | DefKind::Fn))
}
Some(fn_def_id.to_def_id())
}
ItemKind::OpaqueTy(hir::OpaqueTy { origin: hir::OpaqueTyOrigin::TyAlias, .. }) => {
let parent_id = tcx.hir().get_parent_item(hir_id);
assert_ne!(parent_id, hir::CRATE_OWNER_ID);
debug!("generics_of: parent of opaque ty {:?} is {:?}", def_id, parent_id);
Expand Down
4 changes: 3 additions & 1 deletion src/test/ui/async-await/in-trait/nested-rpit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// check-pass
// edition: 2021
// known-bug: #105197
// failure-status:101
// dont-check-compiler-stderr

#![feature(async_fn_in_trait)]
#![feature(return_position_impl_trait_in_trait)]
Expand Down
0