Skip to content

resolve: Improve candidate search for unresolved macro suggestions #62684

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 8 commits into from
Jul 19, 2019
Merged

resolve: Improve candidate search for unresolved macro suggestions #62684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d0bcebd
resolve: Move some diagnostic code into `diagnostics.rs`
petrochenkov Jul 11, 2019
b302f62
resolve: Rename `WhereToResolve` into `Scope`
petrochenkov Jul 11, 2019
1e1b081
resolve: Decouple scope visiting process from visitor actions
petrochenkov Jul 11, 2019
79f0d88
resolve: Use `feature(custom_attribute)` fallback only if the feature…
petrochenkov Jul 11, 2019
329c052
resolve: Visit all scopes to collect suggestion candidates for unreso…
petrochenkov Jul 11, 2019
3845a08
resolve: Move some common code into the scope visitor
petrochenkov Jul 14, 2019
a7726ce
resolve: Attempt to resolve unresolved paths in macro namespace
petrochenkov Jul 15, 2019
1b4fbfc
resolve: Support resolving macro paths without macro kind restrictions
petrochenkov Jul 15, 2019
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
8 changes: 8 additions & 0 deletions src/librustc/hir/def.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,4 +398,12 @@ impl<Id> Res<Id> {
Res::Err => Res::Err,
}
}

pub fn macro_kind(self) -> Option<MacroKind> {
match self {
Res::Def(DefKind::Macro(kind), _) => Some(kind),
Res::NonMacroAttr(..) => Some(MacroKind::Attr),
_ => None,
}
}
}
4 changes: 2 additions & 2 deletions src/librustc_resolve/build_reduced_graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
//! Here we build the "reduced graph": the graph of the module tree without
//! any imports resolved.

use crate::macros::{InvocationData, ParentScope, LegacyScope};
use crate::macros::{InvocationData, LegacyScope};
use crate::resolve_imports::ImportDirective;
use crate::resolve_imports::ImportDirectiveSubclass::{self, GlobImport, SingleImport};
use crate::{Module, ModuleData, ModuleKind, NameBinding, NameBindingKind, Segment, ToNameBinding};
use crate::{ModuleOrUniformRoot, PerNS, Resolver, ResolverArenas, ExternPreludeEntry};
use crate::{ModuleOrUniformRoot, ParentScope, PerNS, Resolver, ResolverArenas, ExternPreludeEntry};
use crate::Namespace::{self, TypeNS, ValueNS, MacroNS};
use crate::{resolve_error, resolve_struct_error, ResolutionError, Determinacy};

Expand Down
Loading