Skip to content

remove duplicate ModuleId alias #67899

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.

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
merged 1 commit into from
Oct 3, 2023

Conversation

davidstone
Copy link
Contributor

@davidstone davidstone commented Oct 1, 2023

[clang] Remove duplicate ModuleId alias

@llvmbot llvmbot added clang Clang issues not falling into any other category clang:frontend Language frontend issues, e.g. anything involving "Sema" clang:modules C++20 modules and Clang Header Modules labels Oct 1, 2023
@llvmbot
Copy link
Member

llvmbot commented Oct 1, 2023

@llvm/pr-subscribers-clang

@llvm/pr-subscribers-clang-modules

Changes

[clang] Remove duplicate ModuleId alias


Full diff: https://github.com/llvm/llvm-project/pull/67899.diff

1 Files Affected:

  • (modified) clang/lib/Lex/ModuleMap.cpp (-2)
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index e8437572ebf4bf6..f65a5f145c04395 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -1551,8 +1551,6 @@ namespace clang {
     /// (or the end of the file).
     void skipUntil(MMToken::TokenKind K);
 
-    using ModuleId = SmallVector<std::pair<std::string, SourceLocation>, 2>;
-
     bool parseModuleId(ModuleId &Id);
     void parseModuleDecl();
     void parseExternModuleDecl();

@davidstone davidstone force-pushed the remove-duplicate-ModuleId-alias branch from 60646e9 to 9bce0ec Compare October 1, 2023 04:30
@davidstone
Copy link
Contributor Author

The description got a little messed up somehow, but should be fixed.

@davidstone davidstone force-pushed the remove-duplicate-ModuleId-alias branch from 9bce0ec to 3583e04 Compare October 1, 2023 16:25
@davidstone
Copy link
Contributor Author

@ChuanqiXu9

Copy link
Member

@ChuanqiXu9 ChuanqiXu9 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks.

This alias is already defined in `clang/Basic/Module.h` to the same value.
@davidstone davidstone force-pushed the remove-duplicate-ModuleId-alias branch from 3583e04 to 07dd53a Compare October 2, 2023 20:22
@ChuanqiXu9 ChuanqiXu9 merged commit 06a05f3 into llvm:main Oct 3, 2023
@davidstone davidstone deleted the remove-duplicate-ModuleId-alias branch October 3, 2023 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang:frontend Language frontend issues, e.g. anything involving "Sema" clang:modules C++20 modules and Clang Header Modules clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants