Skip to content

Commit 76fcfea

Browse files
[clang-tools-extra] Don't including None.h (NFC)
These source files no longer use None, so they do not need to include None.h. This is part of an effort to migrate from llvm::Optional to std::optional: https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716
1 parent bcfdaa9 commit 76fcfea

25 files changed

+0
-25
lines changed

clang-tools-extra/clangd/AST.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "clang/Basic/Specifiers.h"
3131
#include "clang/Index/USRGeneration.h"
3232
#include "llvm/ADT/ArrayRef.h"
33-
#include "llvm/ADT/None.h"
3433
#include "llvm/ADT/Optional.h"
3534
#include "llvm/ADT/STLExtras.h"
3635
#include "llvm/ADT/SmallSet.h"

clang-tools-extra/clangd/ClangdLSPServer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "clang/Tooling/Core/Replacement.h"
2828
#include "llvm/ADT/ArrayRef.h"
2929
#include "llvm/ADT/FunctionExtras.h"
30-
#include "llvm/ADT/None.h"
3130
#include "llvm/ADT/Optional.h"
3231
#include "llvm/ADT/ScopeExit.h"
3332
#include "llvm/ADT/StringRef.h"

clang-tools-extra/clangd/ExpectedTypes.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "clang/AST/Type.h"
1313
#include "clang/Index/USRGeneration.h"
1414
#include "clang/Sema/CodeCompleteConsumer.h"
15-
#include "llvm/ADT/None.h"
1615

1716
namespace clang {
1817
namespace clangd {

clang-tools-extra/clangd/FS.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include "FS.h"
1010
#include "clang/Basic/LLVM.h"
11-
#include "llvm/ADT/None.h"
1211
#include "llvm/Support/Path.h"
1312
#include "llvm/Support/VirtualFileSystem.h"
1413

clang-tools-extra/clangd/GlobalCompilationDatabase.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "clang/Tooling/CompilationDatabase.h"
1919
#include "clang/Tooling/CompilationDatabasePluginRegistry.h"
2020
#include "clang/Tooling/JSONCompilationDatabase.h"
21-
#include "llvm/ADT/None.h"
2221
#include "llvm/ADT/Optional.h"
2322
#include "llvm/ADT/PointerIntPair.h"
2423
#include "llvm/ADT/STLExtras.h"

clang-tools-extra/clangd/Hover.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "clang/Basic/TokenKinds.h"
3939
#include "clang/Index/IndexSymbol.h"
4040
#include "clang/Tooling/Syntax/Tokens.h"
41-
#include "llvm/ADT/None.h"
4241
#include "llvm/ADT/Optional.h"
4342
#include "llvm/ADT/STLExtras.h"
4443
#include "llvm/ADT/SmallVector.h"

clang-tools-extra/clangd/IncludeFixer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "clang/Sema/Sema.h"
3434
#include "clang/Sema/TypoCorrection.h"
3535
#include "llvm/ADT/DenseMap.h"
36-
#include "llvm/ADT/None.h"
3736
#include "llvm/ADT/Optional.h"
3837
#include "llvm/ADT/STLExtras.h"
3938
#include "llvm/ADT/StringExtras.h"

clang-tools-extra/clangd/PathMapping.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "Transport.h"
1010
#include "URI.h"
1111
#include "support/Logger.h"
12-
#include "llvm/ADT/None.h"
1312
#include "llvm/Support/Error.h"
1413
#include "llvm/Support/Path.h"
1514
#include <algorithm>

clang-tools-extra/clangd/Preamble.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include "llvm/ADT/ArrayRef.h"
3333
#include "llvm/ADT/DenseMap.h"
3434
#include "llvm/ADT/IntrusiveRefCntPtr.h"
35-
#include "llvm/ADT/None.h"
3635
#include "llvm/ADT/STLExtras.h"
3736
#include "llvm/ADT/SmallString.h"
3837
#include "llvm/ADT/StringRef.h"

clang-tools-extra/clangd/SemanticHighlighting.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "clang/Basic/SourceLocation.h"
2828
#include "clang/Basic/SourceManager.h"
2929
#include "clang/Tooling/Syntax/Tokens.h"
30-
#include "llvm/ADT/None.h"
3130
#include "llvm/ADT/Optional.h"
3231
#include "llvm/ADT/STLExtras.h"
3332
#include "llvm/ADT/StringRef.h"

clang-tools-extra/clangd/index/StdLib.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "clang/Frontend/CompilerInvocation.h"
2323
#include "clang/Lex/PreprocessorOptions.h"
2424
#include "llvm/ADT/IntrusiveRefCntPtr.h"
25-
#include "llvm/ADT/None.h"
2625
#include "llvm/ADT/StringRef.h"
2726
#include "llvm/Support/MemoryBuffer.h"
2827
#include "llvm/Support/Path.h"

clang-tools-extra/clangd/index/remote/server/Server.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "support/ThreadsafeFS.h"
2323
#include "support/Trace.h"
2424
#include "llvm/ADT/IntrusiveRefCntPtr.h"
25-
#include "llvm/ADT/None.h"
2625
#include "llvm/ADT/StringRef.h"
2726
#include "llvm/Support/Chrono.h"
2827
#include "llvm/Support/CommandLine.h"

clang-tools-extra/clangd/refactor/Rename.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "clang/Basic/LLVM.h"
2727
#include "clang/Basic/SourceLocation.h"
2828
#include "clang/Tooling/Syntax/Tokens.h"
29-
#include "llvm/ADT/None.h"
3029
#include "llvm/ADT/STLExtras.h"
3130
#include "llvm/ADT/StringExtras.h"
3231
#include "llvm/Support/Casting.h"

clang-tools-extra/clangd/refactor/tweaks/DefineInline.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include "clang/Tooling/Core/Replacement.h"
3333
#include "llvm/ADT/DenseMap.h"
3434
#include "llvm/ADT/DenseSet.h"
35-
#include "llvm/ADT/None.h"
3635
#include "llvm/ADT/Optional.h"
3736
#include "llvm/ADT/SmallVector.h"
3837
#include "llvm/ADT/StringRef.h"

clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "clang/Basic/TokenKinds.h"
2828
#include "clang/Tooling/Core/Replacement.h"
2929
#include "clang/Tooling/Syntax/Tokens.h"
30-
#include "llvm/ADT/None.h"
3130
#include "llvm/ADT/Optional.h"
3231
#include "llvm/ADT/STLExtras.h"
3332
#include "llvm/ADT/StringRef.h"

clang-tools-extra/clangd/refactor/tweaks/ExpandAutoType.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "clang/AST/Type.h"
1212
#include "clang/AST/TypeLoc.h"
1313
#include "clang/Basic/LLVM.h"
14-
#include "llvm/ADT/None.h"
1514
#include "llvm/ADT/Optional.h"
1615
#include "llvm/Support/Error.h"
1716
#include <AST.h>

clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
#include "clang/Basic/SourceManager.h"
6565
#include "clang/Tooling/Core/Replacement.h"
6666
#include "clang/Tooling/Refactoring/Extract/SourceExtraction.h"
67-
#include "llvm/ADT/None.h"
6867
#include "llvm/ADT/Optional.h"
6968
#include "llvm/ADT/STLExtras.h"
7069
#include "llvm/ADT/SmallSet.h"

clang-tools-extra/clangd/refactor/tweaks/ObjCMemberwiseInitializer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "clang/Basic/SourceLocation.h"
1919
#include "clang/Basic/SourceManager.h"
2020
#include "clang/Tooling/Core/Replacement.h"
21-
#include "llvm/ADT/None.h"
2221
#include "llvm/ADT/Optional.h"
2322
#include "llvm/ADT/StringRef.h"
2423
#include "llvm/ADT/iterator_range.h"

clang-tools-extra/clangd/support/ThreadsafeFS.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include "support/ThreadsafeFS.h"
1010
#include "Logger.h"
11-
#include "llvm/ADT/None.h"
1211
#include "llvm/ADT/SmallString.h"
1312
#include "llvm/ADT/StringRef.h"
1413
#include "llvm/Support/Path.h"

clang-tools-extra/clangd/unittests/ClangdTests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "clang/Sema/CodeCompleteConsumer.h"
2626
#include "clang/Tooling/ArgumentsAdjusters.h"
2727
#include "clang/Tooling/Core/Replacement.h"
28-
#include "llvm/ADT/None.h"
2928
#include "llvm/ADT/Optional.h"
3029
#include "llvm/ADT/SmallVector.h"
3130
#include "llvm/ADT/StringMap.h"

clang-tools-extra/clangd/unittests/ExpectedTypeTest.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "TestTU.h"
1212
#include "clang/AST/ASTContext.h"
1313
#include "clang/AST/Decl.h"
14-
#include "llvm/ADT/None.h"
1514
#include "llvm/ADT/StringRef.h"
1615
#include "gmock/gmock.h"
1716
#include "gtest/gtest.h"

clang-tools-extra/clangd/unittests/HeaderSourceSwitchTests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "TestTU.h"
1414
#include "index/MemIndex.h"
1515
#include "support/Path.h"
16-
#include "llvm/ADT/None.h"
1716
#include "llvm/Testing/Support/SupportHelpers.h"
1817
#include "gmock/gmock.h"
1918
#include "gtest/gtest.h"

clang-tools-extra/clangd/unittests/HoverTests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "index/MemIndex.h"
1616
#include "clang/AST/Attr.h"
1717
#include "clang/Index/IndexSymbol.h"
18-
#include "llvm/ADT/None.h"
1918
#include "llvm/ADT/StringRef.h"
2019

2120
#include "gmock/gmock.h"

clang-tools-extra/clangd/unittests/TestFS.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "URI.h"
1111
#include "support/Logger.h"
1212
#include "support/Path.h"
13-
#include "llvm/ADT/None.h"
1413
#include "llvm/ADT/Optional.h"
1514
#include "llvm/ADT/StringRef.h"
1615
#include "llvm/Support/Path.h"

clang-tools-extra/pseudo/lib/Forest.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "clang-pseudo/Forest.h"
1010
#include "clang-pseudo/Token.h"
1111
#include "llvm/ADT/ArrayRef.h"
12-
#include "llvm/ADT/None.h"
1312
#include "llvm/ADT/STLExtras.h"
1413
#include "llvm/Support/FormatVariadic.h"
1514

0 commit comments

Comments
 (0)