From ccb07afcbaa13e61d0aa5e2346ce1f7b974b59b9 Mon Sep 17 00:00:00 2001
From: Alexander Condello <arcondello@gmail.com>
Date: Mon, 26 Oct 2020 14:06:43 -0700
Subject: [PATCH] Update .clang-format

* Change ColumnLimit to 80, otherwise it will try to use as much
space as possible
* Change AccessModifierOffset: -3 to make it consistent with
Google style
---
 .clang-format    | 4 ++--
 CONTRIBUTING.rst | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.clang-format b/.clang-format
index a2a843ff..090e383b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -2,10 +2,10 @@
 Language: Cpp
 BasedOnStyle: Google
 
-ColumnLimit: 120
+ColumnLimit: 80
 NamespaceIndentation: Inner
 
 # Scaled by a factor of 2 such that the base indent is 4
-AccessModifierOffset: -2
+AccessModifierOffset: -3
 IndentWidth: 4
 ...
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 4e6e7caf..6131d691 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -144,7 +144,6 @@ Format
 
 * Our format is based on `Google C++ style guide <https://google.github.io/styleguide/cppguide.html>`_ with some exceptions:
 
-  - Column width is limited to 120 characters. Best effort should be made to keep to 80 characters, but up to 120 can be used for clarity.
   - The base indent level is 4.
   - Non-const references are allowed.