Skip to content

Rollup of 6 pull requests #99764

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
bors merged 18 commits into from
Jul 26, 2022
Merged

Rollup of 6 pull requests #99764

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3da2553
Add support for `#[rustc_must_implement_one_of]` to rustdoc
WaffleLapkin Jul 14, 2022
9b9693c
Add rustdoc test for `#[rustc_must_implement_one_of]`
WaffleLapkin Jul 17, 2022
d566334
add backticks
WaffleLapkin Jul 19, 2022
7f1af42
Satisfy theme check
WaffleLapkin Jul 24, 2022
1c4c398
fix rustdoc-gui tests
WaffleLapkin Jul 24, 2022
7ada7c8
remove useless mut from examples
Jul 25, 2022
91599b4
Fix some broken link fragments.
ehuss Jul 25, 2022
ed8c2c2
apply review suggestions
WaffleLapkin Jul 25, 2022
ec83476
Unused tuple fields in rustc_infer.
cjgillot Jul 25, 2022
9450f82
Unused tuple fields in rustc_resolve.
cjgillot Jul 25, 2022
e241d5a
Make `transmute_copy` docs read better
asquared31415 Jul 26, 2022
a660a6f
remove useless `#[allow]` in a test
WaffleLapkin Jul 26, 2022
811b4b8
Rollup merge of #99235 - WaffleLapkin:rustdoc_implement_support_for_m…
matthiaskrgr Jul 26, 2022
ea299e8
Rollup merge of #99716 - sourcelliu:iomut, r=Mark-Simulacrum
matthiaskrgr Jul 26, 2022
dfaf6ec
Rollup merge of #99724 - ehuss:fix-broken-links-fragment, r=Dylan-DPC
matthiaskrgr Jul 26, 2022
ddb6a46
Rollup merge of #99729 - cjgillot:rm-unused-tuple, r=michaelwoerister
matthiaskrgr Jul 26, 2022
a739e28
Rollup merge of #99757 - asquared31415:patch-1, r=Dylan-DPC
matthiaskrgr Jul 26, 2022
8e5bc06
Rollup merge of #99758 - WaffleLapkin:remove_useless_allow, r=Dylan-DPC
matthiaskrgr Jul 26, 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
Prev Previous commit
Next Next commit
Unused tuple fields in rustc_infer.
  • Loading branch information
@cjgillot
cjgillot committed Jul 25, 2022
commit ec83476748f4fa9dd76c4c60a615e6ef6748e7fe
40 changes: 18 additions & 22 deletions compiler/rustc_infer/src/infer/error_reporting/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2410,9 +2410,9 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
#[derive(Debug)]
enum SubOrigin<'hir> {
GAT(&'hir hir::Generics<'hir>),
Impl(&'hir hir::Generics<'hir>),
Trait(&'hir hir::Generics<'hir>),
Fn(&'hir hir::Generics<'hir>),
Impl,
Trait,
Fn,
Unknown,
}
let sub_origin = 'origin: {
Expand All @@ -2427,34 +2427,30 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
kind: hir::ImplItemKind::TyAlias(..),
generics,
..
}) => SubOrigin::GAT(generics),
Node::ImplItem(hir::ImplItem {
kind: hir::ImplItemKind::Fn(..),
generics,
..
}) => SubOrigin::Fn(generics),
Node::TraitItem(hir::TraitItem {
})
| Node::TraitItem(hir::TraitItem {
kind: hir::TraitItemKind::Type(..),
generics,
..
}) => SubOrigin::GAT(generics),
Node::TraitItem(hir::TraitItem {
kind: hir::TraitItemKind::Fn(..),
generics,
Node::ImplItem(hir::ImplItem {
kind: hir::ImplItemKind::Fn(..),
..
}) => SubOrigin::Fn(generics),
Node::Item(hir::Item {
kind: hir::ItemKind::Trait(_, _, generics, _, _),
})
| Node::TraitItem(hir::TraitItem {
kind: hir::TraitItemKind::Fn(..),
..
}) => SubOrigin::Trait(generics),
})
| Node::Item(hir::Item {
kind: hir::ItemKind::Fn(..), ..
}) => SubOrigin::Fn,
Node::Item(hir::Item {
kind: hir::ItemKind::Impl(hir::Impl { generics, .. }),
kind: hir::ItemKind::Trait(..),
..
}) => SubOrigin::Impl(generics),
}) => SubOrigin::Trait,
Node::Item(hir::Item {
kind: hir::ItemKind::Fn(_, generics, _),
..
}) => SubOrigin::Fn(generics),
kind: hir::ItemKind::Impl(..), ..
}) => SubOrigin::Impl,
_ => continue,
};
}
Expand Down