Skip to content

Rollup of 6 pull requests #99150

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

Closed
wants to merge 14 commits into from
Closed

Rollup of 6 pull requests #99150

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
246a80c
Inline Windows `OsStrExt::encode_wide`
nvzqz Jun 7, 2022
da11ff3
core::any: replace some unstable generic types with impl Trait
nrc Jun 13, 2022
a163464
Deny floats even when adt_const_params is enabled
compiler-errors Jul 4, 2022
12d11e9
implement `is_accessible_span`
TaKO8Ki Jul 11, 2022
680fef4
Mention similarly named associated type even if it's not clearly in s…
compiler-errors Jul 11, 2022
f2d8af1
Do not mention private Self types from other crates
compiler-errors Jul 9, 2022
913023b
Use Visibility::is_accessible_from to make suggestion more specific
compiler-errors Jul 11, 2022
018155c
rename a method
TaKO8Ki Jul 11, 2022
2c1ffbb
Rollup merge of #97841 - nvzqz:inline-encode-wide, r=thomcc
Dylan-DPC Jul 11, 2022
219495f
Rollup merge of #98907 - compiler-errors:plz-no-float, r=oli-obk
Dylan-DPC Jul 11, 2022
fcb879e
Rollup merge of #98912 - nrc:provider-it, r=yaahc
Dylan-DPC Jul 11, 2022
aeb0b27
Rollup merge of #99091 - compiler-errors:private-types-should-stay-pr…
Dylan-DPC Jul 11, 2022
fa5b776
Rollup merge of #99140 - TaKO8Ki:implement-is-accessible-span, r=fee1…
Dylan-DPC Jul 11, 2022
96c969c
Rollup merge of #99147 - compiler-errors:issue-55673, r=lcnr
Dylan-DPC Jul 11, 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
Use Visibility::is_accessible_from to make suggestion more specific
  • Loading branch information
@compiler-errors
compiler-errors committed Jul 11, 2022
commit 913023b6b475ac5caed060771526e0777a13ae94
12 changes: 7 additions & 5 deletions compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
if !self.report_similar_impl_candidates(
impl_candidates,
trait_ref,
obligation.cause.body_id,
&mut err,
) {
// This is *almost* equivalent to
Expand Down Expand Up @@ -707,6 +708,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
self.report_similar_impl_candidates(
impl_candidates,
trait_ref,
obligation.cause.body_id,
&mut err,
);
}
Expand Down Expand Up @@ -1353,6 +1355,7 @@ trait InferCtxtPrivExt<'hir, 'tcx> {
&self,
impl_candidates: Vec<ImplCandidate<'tcx>>,
trait_ref: ty::PolyTraitRef<'tcx>,
body_id: hir::HirId,
err: &mut Diagnostic,
) -> bool;

Expand Down Expand Up @@ -1735,6 +1738,7 @@ impl<'a, 'tcx> InferCtxtPrivExt<'a, 'tcx> for InferCtxt<'a, 'tcx> {
&self,
impl_candidates: Vec<ImplCandidate<'tcx>>,
trait_ref: ty::PolyTraitRef<'tcx>,
body_id: hir::HirId,
err: &mut Diagnostic,
) -> bool {
let report = |mut candidates: Vec<TraitRef<'tcx>>, err: &mut Diagnostic| {
Expand Down Expand Up @@ -1816,11 +1820,9 @@ impl<'a, 'tcx> InferCtxtPrivExt<'a, 'tcx> for InferCtxt<'a, 'tcx> {
// FIXME(compiler-errors): This could be generalized, both to
// be more granular, and probably look past other `#[fundamental]`
// types, too.
match self.tcx.visibility(def.did()) {
ty::Visibility::Public => true,
ty::Visibility::Restricted(def_id) => def_id.is_local(),
ty::Visibility::Invisible => false,
}
self.tcx
.visibility(def.did())
.is_accessible_from(body_id.owner.to_def_id(), self.tcx)
} else {
true
}
Expand Down