ensure clean and consistent "namespace" usage #4398

pull Diapolo wants to merge 2 commits into bitcoin:master from Diapolo:namespace changing 10 files +74 −46

Diapolo commented at 12:19 PM on June 24, 2014: none
- remove some missplaced ;
- ensure end of a namespace is clearly visible
- use same formatting when using namespace
laanwj commented at 5:00 AM on June 25, 2014: member

@diapolo I'm fine with this, but it seems pretty arbitrary to me. Can you document these 'rules' somewhere? For example in doc/coding-style.md?

ensure clean and consistent "namespace" usage

- remove some missplaced ;
- ensure end of a namespace is clearly visible
- use same formatting when using namespace

e10dcf27b4

update coding.md to reflect changes by pull
- also mention alphabetical include ordering
86fe1b864b
Diapolo commented at 9:58 AM on June 26, 2014: none

@laanwj I added upates to coding.md!
laanwj commented at 10:16 AM on June 26, 2014: member

ACK!
in doc/coding.md:None in 86fe1b864b
```
  29 | +            // When something fails, return early
  30 | +            if (!Something())
  31 | +                return false;
  32 | +            ...
  33 | +        }
  34 | +
```
laanwj commented at 10:19 AM on June 26, 2014:

Ideally we should also have an if/else if/else statement in here. I always wonder whether to put the } on the same line as the else, etc.

Diapolo commented at 11:38 AM on June 26, 2014:

What do you suggest? I'd like to add a clarification for this also.

<pre> // When something fails, return early if (!Something()) { .... return false; } else if(SomethingElse()) { .... return false; } else return true; </pre>

or

<pre> // When something fails, return early if (!Something()) { .... return false; } else if(SomethingElse()) { .... return false; } else return true; </pre>

Diapolo commented at 9:02 AM on June 27, 2014:

@laanwj Ping, would love to get this cleared up and merged.
BitcoinPullTester commented at 10:45 AM on June 26, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4398_86fe1b864b109869659f140af07047163637a673/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
laanwj merged this on Jun 28, 2014
laanwj closed this on Jun 28, 2014
laanwj referenced this in commit 9125ef9421 on Jun 28, 2014
laanwj commented at 11:21 AM on June 29, 2014: member

This is the last codestyle-change commit I'm going to merge for a while. @sipa is working on a clang-format rule to take care of this automatically, then we can do it in one go, instead of breaking everyone's patches all of the time.
Diapolo deleted the branch on Jun 30, 2014
Diapolo commented at 1:21 PM on June 30, 2014: none

@laanwj I would LOVE to see a standardized way of formatting our files! Hope @sipa is pushing this :).
Diapolo commented at 2:38 PM on June 30, 2014: none

@laanwj Is include file ordering okay or also permitted for now :-P? Yes we have importend stuff to solve, but I get nausea, when looking at such things.
laanwj commented at 2:44 PM on June 30, 2014: member

@Diapolo Include file reordering is fine with me, doesn't generally cause conflicts and if so they're trivial to solve. But no whitespace changes for now.
MarcoFalke locked this on Sep 8, 2021

Contributors

Diapolo

laanwj

BitcoinPullTester