bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #137529 - klensy:unused3, r=lcnr

Browse source 
remove few unused args
This commit is contained in:
León Orell Valerian Liehr 2025-02-26 04:15:04 +01:00 • committed by GitHub
commit 292c003ce7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_resolve/src/diagnostics.rs
View file

@ -2252,7 +2252,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
#[instrument(level = "debug", skip(self, parent_scope))]
pub(crate) fn make_path_suggestion(
&mut self,
span: Span,
mut path: Vec<Segment>,
parent_scope: &ParentScope<'ra>,
) -> Option<(Vec<Segment>, Option<String>)> {
@ -2480,7 +2479,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
// or `use a::{b, c, d}};`
// ^^^^^^^^^^^
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);
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
/// ```
#[instrument(level = "debug", skip(sess))]
fn find_span_immediately_after_crate_name(
sess: &Session,
module_name: Symbol,
use_span: Span,
) -> (bool, Span) {
fn find_span_immediately_after_crate_name(sess: &Session, use_span: Span) -> (bool, Span) {
let source_map = sess.source_map();
// Using `use issue_59764::foo::{baz, makro};` as an example throughout..

8
compiler/rustc_resolve/src/imports.rs
View file

@ -955,11 +955,9 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
} else {
None
};
let err = match self.make_path_suggestion(
span,
import.module_path.clone(),
&import.parent_scope,
) {
let err = match self
.make_path_suggestion(import.module_path.clone(), &import.parent_scope)
{
Some((suggestion, note)) => UnresolvedImportError {
span,
label: None,