Skip to content

Commit c44f724

Browse files
committed
resolve: Remove unused parameter from resolve_ident_in_module
1 parent a5097f3 commit c44f724

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

src/librustc_resolve/build_reduced_graph.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -704,8 +704,7 @@ impl<'a> Resolver<'a> {
704704
} else {
705705
for (name, span) in legacy_imports.imports {
706706
let ident = Ident::with_empty_ctxt(name);
707-
let result = self.resolve_ident_in_module(module, ident, MacroNS,
708-
false, false, span);
707+
let result = self.resolve_ident_in_module(module, ident, MacroNS, false, span);
709708
if let Ok(binding) = result {
710709
let directive = macro_use_directive(span);
711710
self.potentially_unused_imports.push(directive);

src/librustc_resolve/lib.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2002,7 +2002,6 @@ impl<'a> Resolver<'a> {
20022002
module: Module<'a>,
20032003
mut ident: Ident,
20042004
ns: Namespace,
2005-
ignore_unresolved_invocations: bool,
20062005
record_used: bool,
20072006
span: Span)
20082007
-> Result<&'a NameBinding<'a>, Determinacy> {
@@ -2012,7 +2011,7 @@ impl<'a> Resolver<'a> {
20122011
self.current_module = self.macro_def_scope(def);
20132012
}
20142013
let result = self.resolve_ident_in_module_unadjusted(
2015-
module, ident, ns, ignore_unresolved_invocations, record_used, span,
2014+
module, ident, ns, false, record_used, span,
20162015
);
20172016
self.current_module = orig_current_module;
20182017
result
@@ -2518,7 +2517,7 @@ impl<'a> Resolver<'a> {
25182517
// If there is a TraitRef in scope for an impl, then the method must be in the
25192518
// trait.
25202519
if let Some((module, _)) = self.current_trait_ref {
2521-
if self.resolve_ident_in_module(module, ident, ns, false, false, span).is_err() {
2520+
if self.resolve_ident_in_module(module, ident, ns, false, span).is_err() {
25222521
let path = &self.current_trait_ref.as_ref().unwrap().1.path;
25232522
resolve_error(self, span, err(ident.name, &path_names_to_string(path)));
25242523
}
@@ -3468,7 +3467,7 @@ impl<'a> Resolver<'a> {
34683467
}
34693468

34703469
let binding = if let Some(module) = module {
3471-
self.resolve_ident_in_module(module, ident, ns, false, record_used, path_span)
3470+
self.resolve_ident_in_module(module, ident, ns, record_used, path_span)
34723471
} else if opt_ns == Some(MacroNS) {
34733472
self.resolve_lexical_macro_path_segment(ident, ns, record_used, path_span)
34743473
.map(MacroBinding::binding)
@@ -3762,7 +3761,7 @@ impl<'a> Resolver<'a> {
37623761
// Look for associated items in the current trait.
37633762
if let Some((module, _)) = self.current_trait_ref {
37643763
if let Ok(binding) =
3765-
self.resolve_ident_in_module(module, ident, ns, false, false, module.span) {
3764+
self.resolve_ident_in_module(module, ident, ns, false, module.span) {
37663765
let def = binding.def();
37673766
if filter_fn(def) {
37683767
return Some(if self.has_self.contains(&def.def_id()) {
@@ -4075,7 +4074,7 @@ impl<'a> Resolver<'a> {
40754074
let mut found_traits = Vec::new();
40764075
// Look for the current trait.
40774076
if let Some((module, _)) = self.current_trait_ref {
4078-
if self.resolve_ident_in_module(module, ident, ns, false, false, module.span).is_ok() {
4077+
if self.resolve_ident_in_module(module, ident, ns, false, module.span).is_ok() {
40794078
let def_id = module.def_id().unwrap();
40804079
found_traits.push(TraitCandidate { def_id: def_id, import_id: None });
40814080
}

src/librustc_resolve/resolve_imports.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ impl<'a> Resolver<'a> {
244244
SingleImport { source, .. } => source,
245245
_ => unreachable!(),
246246
};
247-
match this.resolve_ident_in_module(module, ident, ns, false, false, path_span) {
247+
match this.resolve_ident_in_module(module, ident, ns, false, path_span) {
248248
Err(Determined) => {}
249249
_ => return false,
250250
}
@@ -630,7 +630,6 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {
630630
source,
631631
ns,
632632
false,
633-
false,
634633
directive.span));
635634
} else {
636635
return
@@ -803,7 +802,7 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {
803802
if all_ns_err {
804803
let mut all_ns_failed = true;
805804
self.per_ns(|this, ns| if !type_ns_only || ns == TypeNS {
806-
match this.resolve_ident_in_module(module, ident, ns, false, true, span) {
805+
match this.resolve_ident_in_module(module, ident, ns, true, span) {
807806
Ok(_) => all_ns_failed = false,
808807
_ => {}
809808
}

0 commit comments

Comments
 (0)