cleanup few unused args
This commit is contained in:
parent
b6d3be4948
commit
cede9029fd
4 changed files with 8 additions and 15 deletions
|
@ -648,7 +648,7 @@ impl<'a, 'tcx> ResultsVisitor<'a, 'tcx, Borrowck<'a, 'tcx>> for MirBorrowckCtxt<
|
||||||
| StatementKind::StorageLive(..) => {}
|
| StatementKind::StorageLive(..) => {}
|
||||||
// This does not affect borrowck
|
// This does not affect borrowck
|
||||||
StatementKind::BackwardIncompatibleDropHint { place, reason: BackwardIncompatibleDropReason::Edition2024 } => {
|
StatementKind::BackwardIncompatibleDropHint { place, reason: BackwardIncompatibleDropReason::Edition2024 } => {
|
||||||
self.check_backward_incompatible_drop(location, (**place, span), state);
|
self.check_backward_incompatible_drop(location, **place, state);
|
||||||
}
|
}
|
||||||
StatementKind::StorageDead(local) => {
|
StatementKind::StorageDead(local) => {
|
||||||
self.access_place(
|
self.access_place(
|
||||||
|
@ -1174,7 +1174,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, '_, 'tcx> {
|
||||||
fn check_backward_incompatible_drop(
|
fn check_backward_incompatible_drop(
|
||||||
&mut self,
|
&mut self,
|
||||||
location: Location,
|
location: Location,
|
||||||
(place, place_span): (Place<'tcx>, Span),
|
place: Place<'tcx>,
|
||||||
state: &BorrowckDomain,
|
state: &BorrowckDomain,
|
||||||
) {
|
) {
|
||||||
let tcx = self.infcx.tcx;
|
let tcx = self.infcx.tcx;
|
||||||
|
|
|
@ -752,7 +752,7 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirUsedCollector<'a, 'tcx> {
|
||||||
/// This does not walk the MIR of the constant as that is not needed for codegen, all we need is
|
/// This does not walk the MIR of the constant as that is not needed for codegen, all we need is
|
||||||
/// to ensure that the constant evaluates successfully and walk the result.
|
/// to ensure that the constant evaluates successfully and walk the result.
|
||||||
#[instrument(skip(self), level = "debug")]
|
#[instrument(skip(self), level = "debug")]
|
||||||
fn visit_const_operand(&mut self, constant: &mir::ConstOperand<'tcx>, location: Location) {
|
fn visit_const_operand(&mut self, constant: &mir::ConstOperand<'tcx>, _location: Location) {
|
||||||
// No `super_constant` as we don't care about `visit_ty`/`visit_ty_const`.
|
// No `super_constant` as we don't care about `visit_ty`/`visit_ty_const`.
|
||||||
let Some(val) = self.eval_constant(constant) else { return };
|
let Some(val) = self.eval_constant(constant) else { return };
|
||||||
collect_const_value(self.tcx, val, self.used_items);
|
collect_const_value(self.tcx, val, self.used_items);
|
||||||
|
|
|
@ -2252,7 +2252,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
|
||||||
#[instrument(level = "debug", skip(self, parent_scope))]
|
#[instrument(level = "debug", skip(self, parent_scope))]
|
||||||
pub(crate) fn make_path_suggestion(
|
pub(crate) fn make_path_suggestion(
|
||||||
&mut self,
|
&mut self,
|
||||||
span: Span,
|
|
||||||
mut path: Vec<Segment>,
|
mut path: Vec<Segment>,
|
||||||
parent_scope: &ParentScope<'ra>,
|
parent_scope: &ParentScope<'ra>,
|
||||||
) -> Option<(Vec<Segment>, Option<String>)> {
|
) -> Option<(Vec<Segment>, Option<String>)> {
|
||||||
|
@ -2480,7 +2479,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
|
||||||
// or `use a::{b, c, d}};`
|
// or `use a::{b, c, d}};`
|
||||||
// ^^^^^^^^^^^
|
// ^^^^^^^^^^^
|
||||||
let (has_nested, after_crate_name) =
|
let (has_nested, after_crate_name) =
|
||||||
find_span_immediately_after_crate_name(self.tcx.sess, module_name, import.use_span);
|
find_span_immediately_after_crate_name(self.tcx.sess, import.use_span);
|
||||||
debug!(has_nested, ?after_crate_name);
|
debug!(has_nested, ?after_crate_name);
|
||||||
|
|
||||||
let source_map = self.tcx.sess.source_map();
|
let source_map = self.tcx.sess.source_map();
|
||||||
|
@ -2687,11 +2686,7 @@ fn extend_span_to_previous_binding(sess: &Session, binding_span: Span) -> Option
|
||||||
/// // ^^^^^^^^^^^^^^^ -- true
|
/// // ^^^^^^^^^^^^^^^ -- true
|
||||||
/// ```
|
/// ```
|
||||||
#[instrument(level = "debug", skip(sess))]
|
#[instrument(level = "debug", skip(sess))]
|
||||||
fn find_span_immediately_after_crate_name(
|
fn find_span_immediately_after_crate_name(sess: &Session, use_span: Span) -> (bool, Span) {
|
||||||
sess: &Session,
|
|
||||||
module_name: Symbol,
|
|
||||||
use_span: Span,
|
|
||||||
) -> (bool, Span) {
|
|
||||||
let source_map = sess.source_map();
|
let source_map = sess.source_map();
|
||||||
|
|
||||||
// Using `use issue_59764::foo::{baz, makro};` as an example throughout..
|
// Using `use issue_59764::foo::{baz, makro};` as an example throughout..
|
||||||
|
|
|
@ -955,11 +955,9 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
let err = match self.make_path_suggestion(
|
let err = match self
|
||||||
span,
|
.make_path_suggestion(import.module_path.clone(), &import.parent_scope)
|
||||||
import.module_path.clone(),
|
{
|
||||||
&import.parent_scope,
|
|
||||||
) {
|
|
||||||
Some((suggestion, note)) => UnresolvedImportError {
|
Some((suggestion, note)) => UnresolvedImportError {
|
||||||
span,
|
span,
|
||||||
label: None,
|
label: None,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue