carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 22:02:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Require braces on conditions and loops. (#218)

Browse Source 
The rationale and rule for this was added in #194 to the C++ style guide
we are using for Carbon.

I've applied the automated fixes from running `clang-tidy` over all the
code, and then run `clang-format` afterward.

There are a few places where `clang-format` fixed a formatting issue
that snuck through in prior commits. These were rare enough that it
didn't seem worth splitting them out into a separate change.
This commit is contained in:
Chandler Carruth
2020-12-08 02:03:43 -08:00
committed by GitHub
parent a7b0e71ab2
commit 27386db279
13 changed files with 144 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/source_buffer.cpp
+11 -6
View File
@@ -3,7 +3,6 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
#include "source/source_buffer.h"
#include "llvm/ADT/ScopeExit.h"
#include <errno.h>
#include <fcntl.h>
@@ -14,6 +13,8 @@
#include <system_error>
#include "llvm/ADT/ScopeExit.h"
namespace Carbon {
auto SourceBuffer::CreateFromText(llvm::Twine text, llvm::StringRef filename)
@@ -32,16 +33,19 @@ auto SourceBuffer::CreateFromFile(llvm::StringRef filename)
errno = 0;
int file_descriptor = open(buffer.filename_.c_str(), O_RDONLY);
if (file_descriptor == -1)
if (file_descriptor == -1) {
return ErrnoToError(errno);
}
// Now that we have an open file, we need to close it on any error.
auto closer = llvm::make_scope_exit([file_descriptor] { close(file_descriptor); });
auto closer =
llvm::make_scope_exit([file_descriptor] { close(file_descriptor); });
struct stat stat_buffer = {};
errno = 0;
if (fstat(file_descriptor, &stat_buffer) == -1)
if (fstat(file_descriptor, &stat_buffer) == -1) {
return ErrnoToError(errno);
}
int64_t size = stat_buffer.st_size;
if (size == 0) {
@@ -51,9 +55,10 @@ auto SourceBuffer::CreateFromFile(llvm::StringRef filename)
errno = 0;
void* mapped_text = mmap(nullptr, size, PROT_READ, MAP_PRIVATE | MAP_POPULATE,
file_descriptor, /*offset=*/0);
if (mapped_text == MAP_FAILED)
file_descriptor, /*offset=*/0);
if (mapped_text == MAP_FAILED) {
return ErrnoToError(errno);
}
errno = 0;
closer.release();