Skip to content

various cleanups to try to reduce the use of spans inside method resolution #104394

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 7 commits into from
Nov 16, 2022
Merged

various cleanups to try to reduce the use of spans inside method resolution #104394

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
83cc620
Flip a boolean that was used wrongly (has no effect though)
oli-obk Nov 9, 2022
44c4a7b
Remove an unnecessary `resolve_vars_if_possible`
oli-obk Nov 9, 2022
c3c3719
Remove some redundant span arguments
oli-obk Nov 9, 2022
e694ef5
Remove the fishy need for a PartialEq impl
oli-obk Nov 9, 2022
e656883
Pull the unstable name collision hint emission out of method probing
oli-obk Nov 11, 2022
d06aac1
Expose the fallibilty of the unstable lint emission in the method name
oli-obk Nov 14, 2022
e2fbd01
Compare picks via `Self` type and associated item id
oli-obk Nov 14, 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
Expose the fallibilty of the unstable lint emission in the method name
  • Loading branch information
@oli-obk
oli-obk committed Nov 15, 2022
commit d06aac178358509cd7f416285e920f67bea1d64b
10 changes: 7 additions & 3 deletions compiler/rustc_hir_typeck/src/method/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
ProbeScope::TraitsInScope,
) {
Ok(pick) => {
pick.emit_unstable_name_collision_hint(self.tcx, method_name.span, call_expr_id);
pick.maybe_emit_unstable_name_collision_hint(
self.tcx,
method_name.span,
call_expr_id,
);
true
}
Err(NoMatch(..)) => false,
Expand Down Expand Up @@ -256,7 +260,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
call_expr.hir_id,
scope,
)?;
pick.emit_unstable_name_collision_hint(self.tcx, method_name.span, call_expr.hir_id);
pick.maybe_emit_unstable_name_collision_hint(self.tcx, method_name.span, call_expr.hir_id);
Ok(pick)
}

Expand Down Expand Up @@ -589,7 +593,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
ProbeScope::TraitsInScope,
)?;

pick.emit_unstable_name_collision_hint(self.tcx, span, expr_id);
pick.maybe_emit_unstable_name_collision_hint(self.tcx, span, expr_id);

self.lint_fully_qualified_call_from_2018(
span,
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_hir_typeck/src/method/probe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,8 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
}

impl<'tcx> Pick<'tcx> {
pub fn emit_unstable_name_collision_hint(
/// In case there were unstable name collisions, emit them as a lint.
pub fn maybe_emit_unstable_name_collision_hint(
&self,
tcx: TyCtxt<'tcx>,
span: Span,
Expand Down