user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Expose the fallibilty of the unstable lint emission in the method name

Browse source
This commit is contained in:
Oli Scherer 2022-11-14 11:21:37 +00:00
parent e65688386b
commit d06aac1783
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_hir_typeck/src/method/mod.rs
View file

@ -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,
@ -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)
}
@ -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,

3
compiler/rustc_hir_typeck/src/method/probe.rs
View file

@ -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,