Skip to content

Commit 5404a37

Browse files
[Driver] Use StringRef::consume_front (NFC)
1 parent 3446601 commit 5404a37

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

clang/lib/Driver/Driver.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6482,18 +6482,15 @@ bool Driver::GetReleaseVersion(StringRef Str, unsigned &Major, unsigned &Minor,
64826482
return false;
64836483
if (Str.empty())
64846484
return true;
6485-
if (Str[0] != '.')
6485+
if (!Str.consume_front("."))
64866486
return false;
64876487

6488-
Str = Str.drop_front(1);
6489-
64906488
if (Str.consumeInteger(10, Minor))
64916489
return false;
64926490
if (Str.empty())
64936491
return true;
6494-
if (Str[0] != '.')
6492+
if (!Str.consume_front("."))
64956493
return false;
6496-
Str = Str.drop_front(1);
64976494

64986495
if (Str.consumeInteger(10, Micro))
64996496
return false;
@@ -6521,9 +6518,8 @@ bool Driver::GetReleaseVersion(StringRef Str,
65216518
Digits[CurDigit] = Digit;
65226519
if (Str.empty())
65236520
return true;
6524-
if (Str[0] != '.')
6521+
if (!Str.consume_front("."))
65256522
return false;
6526-
Str = Str.drop_front(1);
65276523
CurDigit++;
65286524
}
65296525

clang/lib/Driver/ToolChains/CommonArgs.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,7 @@ void tools::handleTargetFeaturesGroup(const Driver &D,
317317
continue;
318318
}
319319

320-
bool IsNegative = Name.starts_with("no-");
321-
if (IsNegative)
322-
Name = Name.substr(3);
320+
bool IsNegative = Name.consume_front("no-");
323321

324322
Features.push_back(Args.MakeArgString((IsNegative ? "-" : "+") + Name));
325323
}

clang/lib/Driver/ToolChains/Hexagon.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,6 @@ StringRef HexagonToolChain::GetTargetCPUVersion(const ArgList &Args) {
801801
CpuArg = A;
802802

803803
StringRef CPU = CpuArg ? CpuArg->getValue() : GetDefaultCPU();
804-
if (CPU.starts_with("hexagon"))
805-
return CPU.substr(sizeof("hexagon") - 1);
804+
CPU.consume_front("hexagon");
806805
return CPU;
807806
}

0 commit comments

Comments
 (0)