Skip to content

Commit 805bd1d

Browse files
wraverywravery
committed
Fix use after move for ResolverParams
1 parent a86b9d0 commit 805bd1d

Some content is hidden

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

42 files changed

+268
-268
lines changed

‎samples/learn/DroidObject.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ std::future<service::ResolverResult> Droid::resolveId(service::ResolverParams&&
4242
{
4343
std::unique_lock resolverLock(_resolverMutex);
4444
auto directives = std::move(params.fieldDirectives);
45-
auto result = getId(service::FieldParams(std::move(params), std::move(directives)));
45+
auto result = getId(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
4646
resolverLock.unlock();
4747

4848
return service::ModifiedResult<response::StringType>::convert(std::move(result), std::move(params));
@@ -57,7 +57,7 @@ std::future<service::ResolverResult> Droid::resolveName(service::ResolverParams&
5757
{
5858
std::unique_lock resolverLock(_resolverMutex);
5959
auto directives = std::move(params.fieldDirectives);
60-
auto result = getName(service::FieldParams(std::move(params), std::move(directives)));
60+
auto result = getName(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
6161
resolverLock.unlock();
6262

6363
return service::ModifiedResult<response::StringType>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
@@ -72,7 +72,7 @@ std::future<service::ResolverResult> Droid::resolveFriends(service::ResolverPara
7272
{
7373
std::unique_lock resolverLock(_resolverMutex);
7474
auto directives = std::move(params.fieldDirectives);
75-
auto result = getFriends(service::FieldParams(std::move(params), std::move(directives)));
75+
auto result = getFriends(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
7676
resolverLock.unlock();
7777

7878
return service::ModifiedResult<service::Object>::convert<service::TypeModifier::Nullable, service::TypeModifier::List, service::TypeModifier::Nullable>(std::move(result), std::move(params));
@@ -87,7 +87,7 @@ std::future<service::ResolverResult> Droid::resolveAppearsIn(service::ResolverPa
8787
{
8888
std::unique_lock resolverLock(_resolverMutex);
8989
auto directives = std::move(params.fieldDirectives);
90-
auto result = getAppearsIn(service::FieldParams(std::move(params), std::move(directives)));
90+
auto result = getAppearsIn(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
9191
resolverLock.unlock();
9292

9393
return service::ModifiedResult<Episode>::convert<service::TypeModifier::Nullable, service::TypeModifier::List, service::TypeModifier::Nullable>(std::move(result), std::move(params));
@@ -102,7 +102,7 @@ std::future<service::ResolverResult> Droid::resolvePrimaryFunction(service::Reso
102102
{
103103
std::unique_lock resolverLock(_resolverMutex);
104104
auto directives = std::move(params.fieldDirectives);
105-
auto result = getPrimaryFunction(service::FieldParams(std::move(params), std::move(directives)));
105+
auto result = getPrimaryFunction(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
106106
resolverLock.unlock();
107107

108108
return service::ModifiedResult<response::StringType>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));

‎samples/learn/HumanObject.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ std::future<service::ResolverResult> Human::resolveId(service::ResolverParams&&
4242
{
4343
std::unique_lock resolverLock(_resolverMutex);
4444
auto directives = std::move(params.fieldDirectives);
45-
auto result = getId(service::FieldParams(std::move(params), std::move(directives)));
45+
auto result = getId(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
4646
resolverLock.unlock();
4747

4848
return service::ModifiedResult<response::StringType>::convert(std::move(result), std::move(params));
@@ -57,7 +57,7 @@ std::future<service::ResolverResult> Human::resolveName(service::ResolverParams&
5757
{
5858
std::unique_lock resolverLock(_resolverMutex);
5959
auto directives = std::move(params.fieldDirectives);
60-
auto result = getName(service::FieldParams(std::move(params), std::move(directives)));
60+
auto result = getName(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
6161
resolverLock.unlock();
6262

6363
return service::ModifiedResult<response::StringType>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
@@ -72,7 +72,7 @@ std::future<service::ResolverResult> Human::resolveFriends(service::ResolverPara
7272
{
7373
std::unique_lock resolverLock(_resolverMutex);
7474
auto directives = std::move(params.fieldDirectives);
75-
auto result = getFriends(service::FieldParams(std::move(params), std::move(directives)));
75+
auto result = getFriends(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
7676
resolverLock.unlock();
7777

7878
return service::ModifiedResult<service::Object>::convert<service::TypeModifier::Nullable, service::TypeModifier::List, service::TypeModifier::Nullable>(std::move(result), std::move(params));
@@ -87,7 +87,7 @@ std::future<service::ResolverResult> Human::resolveAppearsIn(service::ResolverPa
8787
{
8888
std::unique_lock resolverLock(_resolverMutex);
8989
auto directives = std::move(params.fieldDirectives);
90-
auto result = getAppearsIn(service::FieldParams(std::move(params), std::move(directives)));
90+
auto result = getAppearsIn(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
9191
resolverLock.unlock();
9292

9393
return service::ModifiedResult<Episode>::convert<service::TypeModifier::Nullable, service::TypeModifier::List, service::TypeModifier::Nullable>(std::move(result), std::move(params));
@@ -102,7 +102,7 @@ std::future<service::ResolverResult> Human::resolveHomePlanet(service::ResolverP
102102
{
103103
std::unique_lock resolverLock(_resolverMutex);
104104
auto directives = std::move(params.fieldDirectives);
105-
auto result = getHomePlanet(service::FieldParams(std::move(params), std::move(directives)));
105+
auto result = getHomePlanet(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
106106
resolverLock.unlock();
107107

108108
return service::ModifiedResult<response::StringType>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));

‎samples/learn/MutationObject.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ std::future<service::ResolverResult> Mutation::resolveCreateReview(service::Reso
3939
auto argReview = service::ModifiedArgument<learn::ReviewInput>::require("review", params.arguments);
4040
std::unique_lock resolverLock(_resolverMutex);
4141
auto directives = std::move(params.fieldDirectives);
42-
auto result = applyCreateReview(service::FieldParams(std::move(params), std::move(directives)), std::move(argEp), std::move(argReview));
42+
auto result = applyCreateReview(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)), std::move(argEp), std::move(argReview));
4343
resolverLock.unlock();
4444

4545
return service::ModifiedResult<Review>::convert(std::move(result), std::move(params));

‎samples/learn/QueryObject.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ std::future<service::ResolverResult> Query::resolveHero(service::ResolverParams&
4343
auto argEpisode = service::ModifiedArgument<learn::Episode>::require<service::TypeModifier::Nullable>("episode", params.arguments);
4444
std::unique_lock resolverLock(_resolverMutex);
4545
auto directives = std::move(params.fieldDirectives);
46-
auto result = getHero(service::FieldParams(std::move(params), std::move(directives)), std::move(argEpisode));
46+
auto result = getHero(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)), std::move(argEpisode));
4747
resolverLock.unlock();
4848

4949
return service::ModifiedResult<service::Object>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
@@ -59,7 +59,7 @@ std::future<service::ResolverResult> Query::resolveHuman(service::ResolverParams
5959
auto argId = service::ModifiedArgument<response::StringType>::require("id", params.arguments);
6060
std::unique_lock resolverLock(_resolverMutex);
6161
auto directives = std::move(params.fieldDirectives);
62-
auto result = getHuman(service::FieldParams(std::move(params), std::move(directives)), std::move(argId));
62+
auto result = getHuman(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)), std::move(argId));
6363
resolverLock.unlock();
6464

6565
return service::ModifiedResult<Human>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
@@ -75,7 +75,7 @@ std::future<service::ResolverResult> Query::resolveDroid(service::ResolverParams
7575
auto argId = service::ModifiedArgument<response::StringType>::require("id", params.arguments);
7676
std::unique_lock resolverLock(_resolverMutex);
7777
auto directives = std::move(params.fieldDirectives);
78-
auto result = getDroid(service::FieldParams(std::move(params), std::move(directives)), std::move(argId));
78+
auto result = getDroid(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)), std::move(argId));
7979
resolverLock.unlock();
8080

8181
return service::ModifiedResult<Droid>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));

‎samples/learn/ReviewObject.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ std::future<service::ResolverResult> Review::resolveStars(service::ResolverParam
3838
{
3939
std::unique_lock resolverLock(_resolverMutex);
4040
auto directives = std::move(params.fieldDirectives);
41-
auto result = getStars(service::FieldParams(std::move(params), std::move(directives)));
41+
auto result = getStars(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
4242
resolverLock.unlock();
4343

4444
return service::ModifiedResult<response::IntType>::convert(std::move(result), std::move(params));
@@ -53,7 +53,7 @@ std::future<service::ResolverResult> Review::resolveCommentary(service::Resolver
5353
{
5454
std::unique_lock resolverLock(_resolverMutex);
5555
auto directives = std::move(params.fieldDirectives);
56-
auto result = getCommentary(service::FieldParams(std::move(params), std::move(directives)));
56+
auto result = getCommentary(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
5757
resolverLock.unlock();
5858

5959
return service::ModifiedResult<response::StringType>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));

‎samples/separate/AppointmentConnectionObject.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ std::future<service::ResolverResult> AppointmentConnection::resolvePageInfo(serv
3838
{
3939
std::unique_lock resolverLock(_resolverMutex);
4040
auto directives = std::move(params.fieldDirectives);
41-
auto result = getPageInfo(service::FieldParams(std::move(params), std::move(directives)));
41+
auto result = getPageInfo(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
4242
resolverLock.unlock();
4343

4444
return service::ModifiedResult<PageInfo>::convert(std::move(result), std::move(params));
@@ -53,7 +53,7 @@ std::future<service::ResolverResult> AppointmentConnection::resolveEdges(service
5353
{
5454
std::unique_lock resolverLock(_resolverMutex);
5555
auto directives = std::move(params.fieldDirectives);
56-
auto result = getEdges(service::FieldParams(std::move(params), std::move(directives)));
56+
auto result = getEdges(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
5757
resolverLock.unlock();
5858

5959
return service::ModifiedResult<AppointmentEdge>::convert<service::TypeModifier::Nullable, service::TypeModifier::List, service::TypeModifier::Nullable>(std::move(result), std::move(params));

‎samples/separate/AppointmentEdgeObject.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ std::future<service::ResolverResult> AppointmentEdge::resolveNode(service::Resol
3838
{
3939
std::unique_lock resolverLock(_resolverMutex);
4040
auto directives = std::move(params.fieldDirectives);
41-
auto result = getNode(service::FieldParams(std::move(params), std::move(directives)));
41+
auto result = getNode(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
4242
resolverLock.unlock();
4343

4444
return service::ModifiedResult<Appointment>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
@@ -53,7 +53,7 @@ std::future<service::ResolverResult> AppointmentEdge::resolveCursor(service::Res
5353
{
5454
std::unique_lock resolverLock(_resolverMutex);
5555
auto directives = std::move(params.fieldDirectives);
56-
auto result = getCursor(service::FieldParams(std::move(params), std::move(directives)));
56+
auto result = getCursor(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
5757
resolverLock.unlock();
5858

5959
return service::ModifiedResult<response::Value>::convert(std::move(result), std::move(params));

‎samples/separate/AppointmentObject.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ std::future<service::ResolverResult> Appointment::resolveId(service::ResolverPar
4343
{
4444
std::unique_lock resolverLock(_resolverMutex);
4545
auto directives = std::move(params.fieldDirectives);
46-
auto result = getId(service::FieldParams(std::move(params), std::move(directives)));
46+
auto result = getId(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
4747
resolverLock.unlock();
4848

4949
return service::ModifiedResult<response::IdType>::convert(std::move(result), std::move(params));
@@ -58,7 +58,7 @@ std::future<service::ResolverResult> Appointment::resolveWhen(service::ResolverP
5858
{
5959
std::unique_lock resolverLock(_resolverMutex);
6060
auto directives = std::move(params.fieldDirectives);
61-
auto result = getWhen(service::FieldParams(std::move(params), std::move(directives)));
61+
auto result = getWhen(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
6262
resolverLock.unlock();
6363

6464
return service::ModifiedResult<response::Value>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
@@ -73,7 +73,7 @@ std::future<service::ResolverResult> Appointment::resolveSubject(service::Resolv
7373
{
7474
std::unique_lock resolverLock(_resolverMutex);
7575
auto directives = std::move(params.fieldDirectives);
76-
auto result = getSubject(service::FieldParams(std::move(params), std::move(directives)));
76+
auto result = getSubject(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
7777
resolverLock.unlock();
7878

7979
return service::ModifiedResult<response::StringType>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
@@ -88,7 +88,7 @@ std::future<service::ResolverResult> Appointment::resolveIsNow(service::Resolver
8888
{
8989
std::unique_lock resolverLock(_resolverMutex);
9090
auto directives = std::move(params.fieldDirectives);
91-
auto result = getIsNow(service::FieldParams(std::move(params), std::move(directives)));
91+
auto result = getIsNow(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
9292
resolverLock.unlock();
9393

9494
return service::ModifiedResult<response::BooleanType>::convert(std::move(result), std::move(params));
@@ -103,7 +103,7 @@ std::future<service::ResolverResult> Appointment::resolveForceError(service::Res
103103
{
104104
std::unique_lock resolverLock(_resolverMutex);
105105
auto directives = std::move(params.fieldDirectives);
106-
auto result = getForceError(service::FieldParams(std::move(params), std::move(directives)));
106+
auto result = getForceError(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
107107
resolverLock.unlock();
108108

109109
return service::ModifiedResult<response::StringType>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));

‎samples/separate/CompleteTaskPayloadObject.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ std::future<service::ResolverResult> CompleteTaskPayload::resolveTask(service::R
3838
{
3939
std::unique_lock resolverLock(_resolverMutex);
4040
auto directives = std::move(params.fieldDirectives);
41-
auto result = getTask(service::FieldParams(std::move(params), std::move(directives)));
41+
auto result = getTask(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
4242
resolverLock.unlock();
4343

4444
return service::ModifiedResult<Task>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
@@ -53,7 +53,7 @@ std::future<service::ResolverResult> CompleteTaskPayload::resolveClientMutationI
5353
{
5454
std::unique_lock resolverLock(_resolverMutex);
5555
auto directives = std::move(params.fieldDirectives);
56-
auto result = getClientMutationId(service::FieldParams(std::move(params), std::move(directives)));
56+
auto result = getClientMutationId(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
5757
resolverLock.unlock();
5858

5959
return service::ModifiedResult<response::StringType>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));

‎samples/separate/ExpensiveObject.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ std::future<service::ResolverResult> Expensive::resolveOrder(service::ResolverPa
3737
{
3838
std::unique_lock resolverLock(_resolverMutex);
3939
auto directives = std::move(params.fieldDirectives);
40-
auto result = getOrder(service::FieldParams(std::move(params), std::move(directives)));
40+
auto result = getOrder(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
4141
resolverLock.unlock();
4242

4343
return service::ModifiedResult<response::IntType>::convert(std::move(result), std::move(params));

0 commit comments

Comments
 (0)