Skip to content

Commit 7033f9b

Browse files
borsbors
committed
Auto merge of #123918 - DianQK:clang-format, r=Kobzol
Use `clang-format` in `tidy` to check the C++ code style under `llvm-wrapper` Fixes #123510. Based on the discussion at https://rust-lang.zulipchat.com/#narrow/stream/233931-t-compiler.2Fmajor-changes/topic/Enable.20.60clang-format.60.20for.20.60rustc.60.20compiler-team.23756/near/443562800, we can use clang-format from pip to achieve the code formatting. r? `@Kobzol`
2 parents 4bc39f0 + c163d5c commit 7033f9b

File tree

14 files changed

+909
-834
lines changed

14 files changed

+909
-834
lines changed

‎.clang-format

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BasedOnStyle: LLVM

‎.reuse/dep5

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Files: compiler/*
2929
x
3030
x.ps1
3131
x.py
32+
.clang-format
3233
.editorconfig
3334
.git-blame-ignore-revs
3435
.gitattributes

‎Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -5627,6 +5627,7 @@ dependencies = [
56275627
"regex",
56285628
"rustc-hash",
56295629
"semver",
5630+
"similar",
56305631
"termcolor",
56315632
"walkdir",
56325633
]

‎compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp

+14-19
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ struct RustArchiveMember {
1313
Archive::Child Child;
1414

1515
RustArchiveMember()
16-
: Filename(nullptr), Name(nullptr),
17-
Child(nullptr, nullptr, nullptr)
18-
{
19-
}
16+
: Filename(nullptr), Name(nullptr), Child(nullptr, nullptr, nullptr) {}
2017
~RustArchiveMember() {}
2118
};
2219

@@ -27,11 +24,8 @@ struct RustArchiveIterator {
2724
std::unique_ptr<Error> Err;
2825

2926
RustArchiveIterator(Archive::child_iterator Cur, Archive::child_iterator End,
30-
std::unique_ptr<Error> Err)
31-
: First(true),
32-
Cur(Cur),
33-
End(End),
34-
Err(std::move(Err)) {}
27+
std::unique_ptr<Error> Err)
28+
: First(true), Cur(Cur), End(End), Err(std::move(Err)) {}
3529
};
3630

3731
enum class LLVMRustArchiveKind {
@@ -66,8 +60,8 @@ typedef Archive::Child const *LLVMRustArchiveChildConstRef;
6660
typedef RustArchiveIterator *LLVMRustArchiveIteratorRef;
6761

6862
extern "C" LLVMRustArchiveRef LLVMRustOpenArchive(char *Path) {
69-
ErrorOr<std::unique_ptr<MemoryBuffer>> BufOr =
70-
MemoryBuffer::getFile(Path, /*IsText*/false, /*RequiresNullTerminator=*/false);
63+
ErrorOr<std::unique_ptr<MemoryBuffer>> BufOr = MemoryBuffer::getFile(
64+
Path, /*IsText*/ false, /*RequiresNullTerminator=*/false);
7165
if (!BufOr) {
7266
LLVMRustSetLastError(BufOr.getError().message().c_str());
7367
return nullptr;
@@ -146,8 +140,8 @@ extern "C" const char *
146140
LLVMRustArchiveChildName(LLVMRustArchiveChildConstRef Child, size_t *Size) {
147141
Expected<StringRef> NameOrErr = Child->getName();
148142
if (!NameOrErr) {
149-
// rustc_codegen_llvm currently doesn't use this error string, but it might be
150-
// useful in the future, and in the meantime this tells LLVM that the
143+
// rustc_codegen_llvm currently doesn't use this error string, but it might
144+
// be useful in the future, and in the meantime this tells LLVM that the
151145
// error was not ignored and that it shouldn't abort the process.
152146
LLVMRustSetLastError(toString(NameOrErr.takeError()).c_str());
153147
return nullptr;
@@ -172,10 +166,9 @@ extern "C" void LLVMRustArchiveMemberFree(LLVMRustArchiveMemberRef Member) {
172166
delete Member;
173167
}
174168

175-
extern "C" LLVMRustResult
176-
LLVMRustWriteArchive(char *Dst, size_t NumMembers,
177-
const LLVMRustArchiveMemberRef *NewMembers,
178-
bool WriteSymbtab, LLVMRustArchiveKind RustKind, bool isEC) {
169+
extern "C" LLVMRustResult LLVMRustWriteArchive(
170+
char *Dst, size_t NumMembers, const LLVMRustArchiveMemberRef *NewMembers,
171+
bool WriteSymbtab, LLVMRustArchiveKind RustKind, bool isEC) {
179172

180173
std::vector<NewArchiveMember> Members;
181174
auto Kind = fromRust(RustKind);
@@ -206,8 +199,10 @@ LLVMRustWriteArchive(char *Dst, size_t NumMembers,
206199
#if LLVM_VERSION_LT(18, 0)
207200
auto Result = writeArchive(Dst, Members, WriteSymbtab, Kind, true, false);
208201
#else
209-
auto SymtabMode = WriteSymbtab ? SymtabWritingMode::NormalSymtab : SymtabWritingMode::NoSymtab;
210-
auto Result = writeArchive(Dst, Members, SymtabMode, Kind, true, false, nullptr, isEC);
202+
auto SymtabMode = WriteSymbtab ? SymtabWritingMode::NormalSymtab
203+
: SymtabWritingMode::NoSymtab;
204+
auto Result =
205+
writeArchive(Dst, Members, SymtabMode, Kind, true, false, nullptr, isEC);
211206
#endif
212207
if (!Result)
213208
return LLVMRustResult::Success;

‎compiler/rustc_llvm/llvm-wrapper/Linker.cpp

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include "SuppressLLVMWarnings.h"
21
#include "llvm/Linker/Linker.h"
2+
#include "SuppressLLVMWarnings.h"
33

44
#include "LLVMWrapper.h"
55

@@ -9,26 +9,18 @@ struct RustLinker {
99
Linker L;
1010
LLVMContext &Ctx;
1111

12-
RustLinker(Module &M) :
13-
L(M),
14-
Ctx(M.getContext())
15-
{}
12+
RustLinker(Module &M) : L(M), Ctx(M.getContext()) {}
1613
};
1714

18-
extern "C" RustLinker*
19-
LLVMRustLinkerNew(LLVMModuleRef DstRef) {
15+
extern "C" RustLinker *LLVMRustLinkerNew(LLVMModuleRef DstRef) {
2016
Module *Dst = unwrap(DstRef);
2117

2218
return new RustLinker(*Dst);
2319
}
2420

25-
extern "C" void
26-
LLVMRustLinkerFree(RustLinker *L) {
27-
delete L;
28-
}
21+
extern "C" void LLVMRustLinkerFree(RustLinker *L) { delete L; }
2922

30-
extern "C" bool
31-
LLVMRustLinkerAdd(RustLinker *L, char *BC, size_t Len) {
23+
extern "C" bool LLVMRustLinkerAdd(RustLinker *L, char *BC, size_t Len) {
3224
std::unique_ptr<MemoryBuffer> Buf =
3325
MemoryBuffer::getMemBufferCopy(StringRef(BC, Len));
3426

0 commit comments

Comments
 (0)