Skip to content

Commit acc2d15

Browse files
authored
Fix warnings generated by Clang-Tidy (#8181)
* Remove unused namespace alias. * Remove unused 'using' statements. * Remove more unused 'using' and namspace aliases. * Prefer absl::StrContains over comparing `find` result with `npos`. * Remove more unused things. * Prefer usage of `empty()` over `size()` when possible. * Remove more unused things. * Address code review. * Address code review. * More fixes to query_core.cc * comment should match parameter name. * Pre-allocate container capacity for better performance. * More fixes. * Fix inconsistent declaration parameter name. * Fix inconsistent declaration parameter name. * Fix inconsistent declaration parameter name. * Address bugprone-inaccurate-erase (inappropriate `erase` overload was used). * Fix return type of move and copy constructor. * Fix bugprone use after move. * Fix formatting. * Reflect the param name change in the doc.
1 parent 7f57f1f commit acc2d15

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+83
-153
lines changed

Firestore/Example/Tests/API/FIRQuerySnapshotTests.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include "Firestore/core/src/util/string_apple.h"
3838
#include "Firestore/core/test/unit/testutil/testutil.h"
3939

40-
namespace util = firebase::firestore::util;
4140
namespace testutil = firebase::firestore::testutil;
4241

4342
using firebase::firestore::api::DocumentChange;

Firestore/Example/Tests/API/FSTAPIHelpers.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
using firebase::firestore::model::DocumentSet;
5353
using firebase::firestore::model::DocumentState;
5454
using firebase::firestore::model::FieldValue;
55-
using firebase::firestore::model::NoDocument;
5655

5756
using testutil::Doc;
5857
using testutil::Query;

Firestore/Example/Tests/Integration/FSTDatastoreTests.mm

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,11 @@
6565
using firebase::firestore::local::MemoryPersistence;
6666
using firebase::firestore::local::Persistence;
6767
using firebase::firestore::local::QueryEngine;
68-
using firebase::firestore::local::TargetData;
6968
using firebase::firestore::model::BatchId;
7069
using firebase::firestore::model::DatabaseId;
71-
using firebase::firestore::model::DocumentKey;
7270
using firebase::firestore::model::DocumentKeySet;
73-
using firebase::firestore::model::FieldValue;
7471
using firebase::firestore::model::MutationBatch;
7572
using firebase::firestore::model::MutationBatchResult;
76-
using firebase::firestore::model::Precondition;
7773
using firebase::firestore::model::OnlineState;
7874
using firebase::firestore::model::TargetId;
7975
using firebase::firestore::remote::ConnectivityMonitor;
@@ -86,7 +82,6 @@
8682
using firebase::firestore::remote::RemoteStore;
8783
using firebase::firestore::remote::RemoteStoreCallback;
8884
using firebase::firestore::testutil::Map;
89-
using firebase::firestore::testutil::WrapObject;
9085
using firebase::firestore::util::AsyncQueue;
9186
using firebase::firestore::util::Status;
9287

Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ namespace bundle = firebase::firestore::bundle;
5353
namespace core = firebase::firestore::core;
5454
namespace local = firebase::firestore::local;
5555
namespace model = firebase::firestore::model;
56-
namespace nanopb = firebase::firestore::nanopb;
5756
namespace remote = firebase::firestore::remote;
5857
namespace util = firebase::firestore::util;
5958

Firestore/Example/Tests/Util/FSTHelpers.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
using firebase::firestore::model::DatabaseId;
4141
using firebase::firestore::model::DeleteMutation;
4242
using firebase::firestore::model::DocumentKey;
43-
using firebase::firestore::model::FieldMask;
4443
using firebase::firestore::model::FieldPath;
4544
using firebase::firestore::model::FieldValue;
4645
using firebase::firestore::model::ObjectValue;

Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,14 @@
5252
#include "Firestore/core/test/unit/testutil/status_testing.h"
5353
#include "absl/memory/memory.h"
5454

55-
namespace testutil = firebase::firestore::testutil;
5655
namespace util = firebase::firestore::util;
5756

5857
using firebase::firestore::auth::CredentialChangeListener;
59-
using firebase::firestore::auth::CredentialsProvider;
6058
using firebase::firestore::auth::EmptyCredentialsProvider;
6159
using firebase::firestore::auth::User;
6260
using firebase::firestore::core::DatabaseInfo;
6361
using firebase::firestore::local::LevelDbOpener;
6462
using firebase::firestore::model::DatabaseId;
65-
using firebase::firestore::remote::GrpcConnection;
6663
using firebase::firestore::remote::FirebaseMetadataProviderApple;
6764
using firebase::firestore::testutil::AppForUnitTesting;
6865
using firebase::firestore::testutil::AsyncQueueForTesting;

Firestore/Source/API/FIRDocumentReference.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
using firebase::firestore::core::ParsedUpdateData;
6060
using firebase::firestore::model::DocumentKey;
6161
using firebase::firestore::model::ResourcePath;
62-
using firebase::firestore::util::Status;
6362
using firebase::firestore::util::StatusOr;
6463
using firebase::firestore::util::StatusOrCallback;
6564
using firebase::firestore::util::ThrowInvalidArgument;

Firestore/Source/API/FIRDocumentSnapshot.mm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
#include "Firestore/core/src/util/string_apple.h"
4646

4747
namespace util = firebase::firestore::util;
48-
using firebase::Timestamp;
49-
using firebase::firestore::GeoPoint;
5048
using firebase::firestore::api::DocumentSnapshot;
5149
using firebase::firestore::api::Firestore;
5250
using firebase::firestore::api::MakeFIRGeoPoint;

Firestore/Source/API/FIRLoadBundleTask.mm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727

2828
namespace {
2929

30-
namespace api = firebase::firestore::api;
31-
namespace util = firebase::firestore::util;
3230
using firebase::firestore::util::ThrowInvalidArgument;
3331

3432
} // namespace

Firestore/Source/API/FIRQuery.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
#include "Firestore/core/src/util/statusor.h"
5656
#include "Firestore/core/src/util/string_apple.h"
5757
#include "absl/memory/memory.h"
58+
#include "absl/strings/match.h"
5859

5960
namespace util = firebase::firestore::util;
6061
using firebase::firestore::api::Firestore;
61-
using firebase::firestore::api::ListenerRegistration;
6262
using firebase::firestore::api::Query;
6363
using firebase::firestore::api::QueryListenerRegistration;
6464
using firebase::firestore::api::QuerySnapshot;
@@ -592,7 +592,7 @@ - (Bound)boundFromFieldValues:(NSArray<id> *)fieldValues isBefore:(BOOL)isBefore
592592
ThrowInvalidArgument("Invalid query. Expected a string for the document ID.");
593593
}
594594
const std::string &documentID = fieldValue.string_value();
595-
if (!self.query.IsCollectionGroupQuery() && documentID.find('/') != std::string::npos) {
595+
if (!self.query.IsCollectionGroupQuery() && absl::StrContains(documentID, "/")) {
596596
ThrowInvalidArgument("Invalid query. When querying a collection and ordering by document "
597597
"ID, you must pass a plain document ID, but '%s' contains a slash.",
598598
documentID);

0 commit comments

Comments
 (0)