Merge branch 'master' into jsoncpp_version

baylesj · web-flow · commit ab01a90aaf21 · 2020-11-06T13:22:44.000-08:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -143,7 +143,9 @@ bool Reader::decodeNumber(Token& token) {
 ```
 
 Before submitting your code, ensure that you meet the versioning requirements above, follow the style guide of the file you are modifying (or the above rules for new files), and run clang format. Meson exposes clang format with the following command:
-
 ```
 ninja -v -C build-${LIB_TYPE}/ clang-format
 ```
+
+For convenience, you can also run the `reformat.sh` script located in the root directory.
+
diff --git a/include/json/value.h b/include/json/value.h
@@ -263,10 +263,10 @@ class JSON_API Value {
     CZString(ArrayIndex index);
     CZString(char const* str, unsigned length, DuplicationPolicy allocate);
     CZString(CZString const& other);
-    CZString(CZString&& other);
+    CZString(CZString&& other) noexcept;
     ~CZString();
     CZString& operator=(const CZString& other);
-    CZString& operator=(CZString&& other);
+    CZString& operator=(CZString&& other) noexcept;
 
     bool operator<(CZString const& other) const;
     bool operator==(CZString const& other) const;
@@ -344,13 +344,13 @@ class JSON_API Value {
   Value(bool value);
   Value(std::nullptr_t ptr) = delete;
   Value(const Value& other);
-  Value(Value&& other);
+  Value(Value&& other) noexcept;
   ~Value();
 
   /// \note Overwrite existing comments. To preserve comments, use
   /// #swapPayload().
   Value& operator=(const Value& other);
-  Value& operator=(Value&& other);
+  Value& operator=(Value&& other) noexcept;
 
   /// Swap everything.
   void swap(Value& other);
@@ -635,9 +635,9 @@ class JSON_API Value {
   public:
     Comments() = default;
     Comments(const Comments& that);
-    Comments(Comments&& that);
+    Comments(Comments&& that) noexcept;
     Comments& operator=(const Comments& that);
-    Comments& operator=(Comments&& that);
+    Comments& operator=(Comments&& that) noexcept;
     bool has(CommentPlacement slot) const;
     String get(CommentPlacement slot) const;
     void set(CommentPlacement slot, String comment);
diff --git a/reformat.sh b/reformat.sh
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
@@ -1921,7 +1921,7 @@ bool CharReaderBuilder::validate(Json::Value* invalid) const {
     if (valid_keys.count(key))
       continue;
     if (invalid)
-      (*invalid)[std::move(key)] = *si;
+      (*invalid)[key] = *si;
     else
       return false;
   }
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -259,7 +259,7 @@ Value::CZString::CZString(const CZString& other) {
   storage_.length_ = other.storage_.length_;
 }
 
-Value::CZString::CZString(CZString&& other)
+Value::CZString::CZString(CZString&& other) noexcept
     : cstr_(other.cstr_), index_(other.index_) {
   other.cstr_ = nullptr;
 }
@@ -285,7 +285,7 @@ Value::CZString& Value::CZString::operator=(const CZString& other) {
   return *this;
 }
 
-Value::CZString& Value::CZString::operator=(CZString&& other) {
+Value::CZString& Value::CZString::operator=(CZString&& other) noexcept {
   cstr_ = other.cstr_;
   index_ = other.index_;
   other.cstr_ = nullptr;
@@ -433,7 +433,7 @@ Value::Value(const Value& other) {
   dupMeta(other);
 }
 
-Value::Value(Value&& other) {
+Value::Value(Value&& other) noexcept {
   initBasic(nullValue);
   swap(other);
 }
@@ -448,7 +448,7 @@ Value& Value::operator=(const Value& other) {
   return *this;
 }
 
-Value& Value::operator=(Value&& other) {
+Value& Value::operator=(Value&& other) noexcept {
   other.swap(*this);
   return *this;
 }
@@ -1373,14 +1373,15 @@ bool Value::isObject() const { return type() == objectValue; }
 Value::Comments::Comments(const Comments& that)
     : ptr_{cloneUnique(that.ptr_)} {}
 
-Value::Comments::Comments(Comments&& that) : ptr_{std::move(that.ptr_)} {}
+Value::Comments::Comments(Comments&& that) noexcept
+    : ptr_{std::move(that.ptr_)} {}
 
 Value::Comments& Value::Comments::operator=(const Comments& that) {
   ptr_ = cloneUnique(that.ptr_);
   return *this;
 }
 
-Value::Comments& Value::Comments::operator=(Comments&& that) {
+Value::Comments& Value::Comments::operator=(Comments&& that) noexcept {
   ptr_ = std::move(that.ptr_);
   return *this;
 }
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
@@ -1217,7 +1217,7 @@ bool StreamWriterBuilder::validate(Json::Value* invalid) const {
     if (valid_keys.count(key))
       continue;
     if (invalid)
-      (*invalid)[std::move(key)] = *si;
+      (*invalid)[key] = *si;
     else
       return false;
   }

Original file line number	Diff line number	Diff line change
`@@ -1921,7 +1921,7 @@ bool CharReaderBuilder::validate(Json::Value* invalid) const {`
`1921`	`1921`	`if (valid_keys.count(key))`
`1922`	`1922`	`continue;`
`1923`	`1923`	`if (invalid)`
`1924`		`- (invalid)[std::move(key)] = si;`
	`1924`	`+ (invalid)[key] = si;`
`1925`	`1925`	`else`
`1926`	`1926`	`return false;`
`1927`	`1927`	`}`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ Value::CZString::CZString(const CZString& other) {`
`259`	`259`	`storage_.length_ = other.storage_.length_;`
`260`	`260`	`}`
`261`	`261`
`262`		`-Value::CZString::CZString(CZString&& other)`
	`262`	`+Value::CZString::CZString(CZString&& other) noexcept`
`263`	`263`	`: cstr_(other.cstr_), index_(other.index_) {`
`264`	`264`	`other.cstr_ = nullptr;`
`265`	`265`	`}`
`@@ -285,7 +285,7 @@ Value::CZString& Value::CZString::operator=(const CZString& other) {`
`285`	`285`	`return *this;`
`286`	`286`	`}`
`287`	`287`
`288`		`-Value::CZString& Value::CZString::operator=(CZString&& other) {`
	`288`	`+Value::CZString& Value::CZString::operator=(CZString&& other) noexcept {`
`289`	`289`	`cstr_ = other.cstr_;`
`290`	`290`	`index_ = other.index_;`
`291`	`291`	`other.cstr_ = nullptr;`
`@@ -433,7 +433,7 @@ Value::Value(const Value& other) {`
`433`	`433`	`dupMeta(other);`
`434`	`434`	`}`
`435`	`435`
`436`		`-Value::Value(Value&& other) {`
	`436`	`+Value::Value(Value&& other) noexcept {`
`437`	`437`	`initBasic(nullValue);`
`438`	`438`	`swap(other);`
`439`	`439`	`}`
`@@ -448,7 +448,7 @@ Value& Value::operator=(const Value& other) {`
`448`	`448`	`return *this;`
`449`	`449`	`}`
`450`	`450`
`451`		`-Value& Value::operator=(Value&& other) {`
	`451`	`+Value& Value::operator=(Value&& other) noexcept {`
`452`	`452`	`other.swap(*this);`
`453`	`453`	`return *this;`
`454`	`454`	`}`
`@@ -1373,14 +1373,15 @@ bool Value::isObject() const { return type() == objectValue; }`
`1373`	`1373`	`Value::Comments::Comments(const Comments& that)`
`1374`	`1374`	`: ptr_{cloneUnique(that.ptr_)} {}`
`1375`	`1375`
`1376`		`-Value::Comments::Comments(Comments&& that) : ptr_{std::move(that.ptr_)} {}`
	`1376`	`+Value::Comments::Comments(Comments&& that) noexcept`
	`1377`	`+ : ptr_{std::move(that.ptr_)} {}`
`1377`	`1378`
`1378`	`1379`	`Value::Comments& Value::Comments::operator=(const Comments& that) {`
`1379`	`1380`	`ptr_ = cloneUnique(that.ptr_);`
`1380`	`1381`	`return *this;`
`1381`	`1382`	`}`
`1382`	`1383`
`1383`		`-Value::Comments& Value::Comments::operator=(Comments&& that) {`
	`1384`	`+Value::Comments& Value::Comments::operator=(Comments&& that) noexcept {`
`1384`	`1385`	`ptr_ = std::move(that.ptr_);`
`1385`	`1386`	`return *this;`
`1386`	`1387`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1217,7 +1217,7 @@ bool StreamWriterBuilder::validate(Json::Value* invalid) const {`
`1217`	`1217`	`if (valid_keys.count(key))`
`1218`	`1218`	`continue;`
`1219`	`1219`	`if (invalid)`
`1220`		`- (invalid)[std::move(key)] = si;`
	`1220`	`+ (invalid)[key] = si;`
`1221`	`1221`	`else`
`1222`	`1222`	`return false;`
`1223`	`1223`	`}`