More resolution modules with attribute path #1528
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bjorn3
reviewed
Jul 13, 2019
| @@ -497,7 +497,7 @@ where | |||
|
|
|||
| fn collect_module(&mut self, module: &raw::ModuleData) { | |||
| match module { | |||
| // inline module, just recurse | |||
| // inline module, just recursive | |||
There was a problem hiding this comment.
I think recurse is correct here and below.
matklad
reviewed
Jul 13, 2019
| separator(&file_path[current_dir.len()..]) | ||
| } else { | ||
| separator(file_path.as_str()) | ||
| } |
There was a problem hiding this comment.
I think one can avoid the closure here:
if cond {
branch1
} else {
branch2
}.replace("\\", "/")| #[test] | ||
| fn module_resolution_module_decl_path_super() { | ||
| let map = def_map_with_crate_graph( | ||
| " |
There was a problem hiding this comment.
let's use an r#" literal here to avoid escaping " and \ everywhere?
| @@ -675,6 +676,17 @@ fn resolve_submodule( | |||
| } | |||
| } | |||
|
|
|||
| fn normalize_attribute_path(file_path: &SmolStr) -> String { | |||
There was a problem hiding this comment.
We could optimisitally try to avoid an allocation here, but, given this is already a cold path, this shouldn't matter.
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Jul 14, 2019
1528: More resolution modules with attribute path r=matklad a=andreevlex #1211 Co-authored-by: Alexander Andreev <[email protected]>
Build succeeded |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#1211