[llvm-ar] Uncapitalize and delete full stop from error messages

[MaskRay]

Summary

Most GNU binutils don't append full stops in error messages. This
convention has been adopted by a bunch of LLVM binary utilities. Make
llvm-ar follow the convention as well.

[grimar]

tools/llvm-ar/llvm-ar.cpp

1138

Should we remove ! too?

[grimar]

tools/llvm-ar/llvm-ar.cpp

386

btw, below modifiers are sometimes wrapped into ''. May be worth to make this consistent in messages while you are here too?

[MaskRay]

Delete !

[MaskRay]

Wrap operation names in ''

tools/llvm-ar/llvm-ar.cpp

386

Wrapped in '' for consistency.

It seems many error messages here are no tested. This is something we should improve in the future.

[grimar]

LGTM with a nits.

tools/llvm-ar/llvm-ar.cpp

212

nit: needs wrapping too it seems.

221

The same.

386

Yeah. I also found one more inconsistency:

"cannot mix -M and other options"

Seems in other places we use the word "operation", but here the word "option" with a dash.
It is anyways out of the area of this patch, just had to mention :)

[MaskRay]

Wrap two other error messages

test/Object/archive-extract.test

 
 RUN: not llvm-ar x %p/Inputs/thin.a foo.o 2>&1 | FileCheck %s --check-prefix=THINEXTRACT
 THINEXTRACT: extracting from a thin archive is not supported
 
 RUN: llvm-ar p %p/Inputs/thin.a evenlen | FileCheck %s --check-prefix=EVENLEN
 EVENLEN: evenlen
 
 RUN: not llvm-ar p %p/Inputs/thin-path.a t/test2.o 2>&1 | FileCheck %s --check-prefix=MISSING
-MISSING: {{N|n}}o such file or directory.
+MISSING: error: {{N|n}}o such file or directory

test/Object/archive-format.test

 THIN-PATH-NEXT: ..{{/|\\}}foo{{/|\\}}0123456789abcde/
 THIN-PATH-NEXT: ..{{/|\\}}foo{{/|\\}}0123456789abcdef/
 THIN-PATH-NEXT: /0              0           0     0     644     4         `
 THIN-PATH-NEXT: /20             0           0     0     644     4         `
 THIN-PATH-NEXT: /41             0           0     0     644     4         `
 THIN-PATH-NEXT: /65             0           0     0     644     4         `
 
 RUN: not llvm-ar --format=bsd rcT bad.a 0123456789abcde 0123456789abcdef 2>&1 | FileCheck --check-prefix=BSD-THIN %s
-BSD-THIN: Only the gnu format has a thin mode.
+BSD-THIN: error: only the gnu format has a thin mode
 
 If an archive has an object with no symbols, the linker and some other
 tools on some versions of Solaris will abort operations if there is no
 symbol table.  Create such an object, put it into an archive, and check to
 see that there is an empty symbol table.
 RUN: mkdir -p %t
 RUN: yaml2obj %S/Inputs/solaris-nosymbols.yaml > %t/foo.o
 RUN: llvm-ar rs %t/foo.a %t/foo.o
 RUN: cat -v %t/foo.a | FileCheck -strict-whitespace --check-prefix=SOLARIS %s
 SOLARIS:      !<arch>
 SOLARIS-NEXT: /               0           0     0     0       8         `
 SOLARIS-NEXT: ^@^@^@^@^@^@^@^@foo.o/

test/Object/archive-update.test

 RUN: llvm-ar --format=gnu rcT %t/tmp.a bar
 RUN: llvm-ar t %t/tmp.a | FileCheck --check-prefix=BOTH-FILES %s
 BOTH-FILES: foo
 BOTH-FILES: bar
 
 RUN: rm -f %t/tmp.a
 RUN: llvm-ar --format=gnu rc %t/tmp.a foo
 RUN: not llvm-ar --format=gnu rcT %t/tmp.a bar 2>&1 | FileCheck --check-prefix=ERROR %s
-ERROR: Cannot convert a regular archive to a thin one.
+ERROR: error: cannot convert a regular archive to a thin one

test/Object/mri2.test

 ; RUN: echo create %t.a > %t.mri
 ; RUN: echo create %t.a >> %t.mri
 ; RUN: echo save >> %t.mri
 ; RUN: echo end >> %t.mri
 
 ; RUN: not llvm-ar -M  < %t.mri 2>&1 | FileCheck %s
-; CHECK: Editing multiple archives not supported
+; CHECK: error: editing multiple archives not supported

test/Object/mri3.test

 ; RUN: echo save > %t.mri
 ; RUN: echo create %t.a >> %t.mri
 ; RUN: echo end >> %t.mri
 
 ; RUN: not llvm-ar -M  < %t.mri 2>&1 | FileCheck %s
-; CHECK: File already saved.
+; CHECK: error: file already saved

test/Object/mri4.test

 ; RUN: echo abc > %t.mri
 
 ; RUN: not llvm-ar -M  < %t.mri 2>&1 | FileCheck %s
-; CHECK: Unknown command: abc.
+; CHECK: error: unknown command: abc

test/Object/mri5.test

 ; RUN: not llvm-ar -M t < %s 2>&1 | FileCheck %s
-; CHECK: Cannot mix -M and other options.
+; CHECK: error: cannot mix -M and other options

test/tools/llvm-ar/count.test

 RUN: not llvm-ar xN abc %t/archive.a foo.txt 2>&1 | FileCheck %s --check-prefix=ERR-NOT-NUM
 RUN: not llvm-ar xN 0x1 %t/archive.a foo.txt 2>&1 | FileCheck %s --check-prefix=ERR-NOT-NUM
 # Only three members named foo, so 1 <= N <= 3.
 RUN: not llvm-ar xN 0 %t/archive.a foo.txt 2>&1 | FileCheck %s --check-prefix=ERR-NOT-POS
 RUN: not llvm-ar xN 4 %t/archive.a foo.txt 2>&1 | FileCheck %s --check-prefix=ERR-NOT-FOUND
 # N only applies to x/d.
 RUN: not llvm-ar rN 1 %t/archive.a foo.txt 2>&1 | FileCheck %s --check-prefix=ERR-BAD-OP
 
-ERR-NOT-NUM:   error: Value for [count] must be numeric
-ERR-NOT-POS:   error: Value for [count] must be positive
-ERR-BAD-OP:    error: The 'N' modifier can only be specified with the 'x' or 'd' operations
+ERR-NOT-NUM:   error: value for [count] must be numeric
+ERR-NOT-POS:   error: value for [count] must be positive
+ERR-BAD-OP:    error: the 'N' modifier can only be specified with the 'x' or 'd' operations
 ERR-NOT-FOUND: error: 'foo.txt' was not found
 
 # Extract individual items.
 
 RUN: rm -f foo.txt bar.txt
 RUN: llvm-ar xN 1 %t/archive.a foo.txt bar.txt
 RUN: cat %t/foo.txt | FileCheck %s --check-prefix=FOO-1
 RUN: cat %t/bar.txt | FileCheck %s --check-prefix=BAR-1

test/tools/llvm-ar/insert-after.test

 
 # Insert after invalid file:
 RUN: rm -f %t-invalid.a
 RUN: llvm-ar rc %t-invalid.a %t1.txt %t2.txt %t3.txt
 RUN: not llvm-ar ra invalid.txt %t-invalid.a %t2.txt 2>&1 \
 RUN:   | FileCheck %s --check-prefix=ERROR
 RUN: llvm-ar t %t-invalid.a | FileCheck %s --check-prefix=INVALID
 
-ERROR: error: Insertion point not found.
+ERROR: error: insertion point not found
 INVALID:      1.txt
 INVALID-NEXT: 2.txt
 INVALID-NEXT: 3.txt
 
 # Insert file at the same position:
 RUN: rm -f %t-position.a
 RUN: llvm-ar rc %t-position.a %t1.txt %t2.txt %t3.txt
 RUN: llvm-ar ra %t1.txt %t-position.a %t2.txt
 RUN: llvm-ar t %t-position.a | FileCheck %s --check-prefix=POSITION
 
 POSITION:      1.txt
 POSITION-NEXT: 2.txt
 POSITION-NEXT: 3.txt

test/tools/llvm-ar/insert-before.test

 
 # Insert before an invalid file:
 RUN: rm -f %t-invalid.a
 RUN: llvm-ar rc %t-invalid.a %t1.txt %t2.txt %t3.txt
 RUN: not llvm-ar rb invalid.txt %t-invalid.a %t2.txt 2>&1 \
 RUN:   | FileCheck %s --check-prefix=ERROR
 RUN: llvm-ar t %t-invalid.a | FileCheck %s --check-prefix=INVALID
 
-ERROR: error: Insertion point not found.
+ERROR: error: insertion point not found
 INVALID:      1.txt
 INVALID-NEXT: 2.txt
 INVALID-NEXT: 3.txt
 
 # Insert file at the same position:
 RUN: rm -f %t-position.a
 RUN: llvm-ar rc %t-position.a %t1.txt %t2.txt %t3.txt
 RUN: llvm-ar rb %t3.txt %t-position.a %t2.txt
 RUN: llvm-ar t %t-position.a | FileCheck %s --check-prefix=POSITION
 
 POSITION:      1.txt
 POSITION-NEXT: 2.txt
 POSITION-NEXT: 3.txt

test/tools/llvm-ar/invalid-command-line.test

 Test that llvm-ar exits with 1 when there is an error.
 
 RUN: not llvm-ar e 2>&1 | FileCheck %s
-CHECK: unknown option e.
+CHECK: error: unknown option e
 CHECK: OVERVIEW: LLVM Archiver

test/tools/llvm-ar/move-after.test

 
 # Move after invalid file:
 RUN: rm -f %t-invalid.a
 RUN: llvm-ar rc %t-invalid.a %t1.txt %t2.txt %t3.txt
 RUN: not llvm-ar ma invalid.txt %t-invalid.a %t2.txt 2>&1 \
 RUN:   | FileCheck %s --check-prefix=ERROR
 RUN: llvm-ar t %t-invalid.a | FileCheck %s --check-prefix=INVALID
 
-ERROR: error: Insertion point not found.
+ERROR: error: insertion point not found
 INVALID:      1.txt
 INVALID-NEXT: 2.txt
 INVALID-NEXT: 3.txt
 
 # Move file to the same position:
 RUN: rm -f %t-position.a
 RUN: llvm-ar rc %t-position.a %t1.txt %t2.txt %t3.txt
 RUN: llvm-ar ma %t1.txt %t-position.a %t2.txt
 RUN: llvm-ar t %t-position.a | FileCheck %s --check-prefix=POSITION
 
 POSITION:      1.txt
 POSITION-NEXT: 2.txt
 POSITION-NEXT: 3.txt

test/tools/llvm-ar/move-before.test

 
 # Move before invalid file:
 RUN: rm -f %t-invalid.a
 RUN: llvm-ar rc %t-invalid.a %t1.txt %t2.txt %t3.txt
 RUN: not llvm-ar mb invalid.txt %t-invalid.a %t2.txt 2>&1 \
 RUN:   | FileCheck %s --check-prefix=ERROR
 RUN: llvm-ar t %t-invalid.a | FileCheck %s --check-prefix=INVALID
 
-ERROR: error: Insertion point not found.
+ERROR: error: insertion point not found
 INVALID:      1.txt
 INVALID-NEXT: 2.txt
 INVALID-NEXT: 3.txt
 
 # Move file to the same position:
 RUN: rm -f %t-position.a
 RUN: llvm-ar rc %t-position.a %t1.txt %t2.txt %t3.txt
 RUN: llvm-ar mb %t3.txt %t-position.a %t2.txt

test/tools/llvm-ar/move.test

 # WITHOUT-SYM:      symbol1
 # WITHOUT-SYM-NEXT: symbol2
 # WITHOUT-SYM-NEXT: symbol3
 
 ## No archive:
 # RUN: not llvm-ar m 2>&1 \
 # RUN:   | FileCheck %s --check-prefix=NO-ARCHIVE
 
-# NO-ARCHIVE: error: An archive name must be specified.
+# NO-ARCHIVE: error: an archive name must be specified
 
 ## Member does not exist:
 # RUN: llvm-ar rc %t/missing.a %t/1.o %t/2.o %t/3.o
 # RUN: not llvm-ar m %t/missing.a %t/missing.txt 2>&1 \
 # RUN:   | FileCheck %s --check-prefix=MISSING-FILE -DFILE=%t/missing.txt
 
-# MISSING-FILE: error: [[FILE]]: {{[nN]}}o such file or directory.
+# MISSING-FILE: error: [[FILE]]: {{[nN]}}o such file or directory
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_X86_64
 Sections:

test/tools/llvm-ar/mri-addlib.test

 
 ## ADDLIB with non-archive file.
 # RUN: echo "CREATE %t/badlib.a" > %t/badlib.mri
 # RUN: echo "ADDLIB %s" >> %t/badlib.mri
 # RUN: echo "SAVE" >> %t/badlib.mri
 # RUN: not llvm-ar -M < %t/badlib.mri 2>&1 | FileCheck --check-prefix=PARSE %s
 # RUN: not ls %t/badlib.a
 
-# PARSE: Could not parse library
+# PARSE: error: could not parse library
 
 ## No create command.
 # RUN: echo "ADDLIB %t/f.a"  > %t/nocreate.mri
 # RUN: echo "SAVE" >> %t/nocreate.mri
 # RUN: not llvm-ar -M < %t/nocreate.mri
 
 --- !ELF
 FileHeader:

test/tools/llvm-ar/print.test

 llvm-ar -q %t/archive.a %t/2.txt
 RUN: not llvm-ar p %t/archive.a %t/2.txt %t/2.txt 2>&1 \
 RUN:   | FileCheck %s --check-prefix=SAME -DFILE=%t/2.txt
 
 # No archive:
 RUN: not llvm-ar p 2>&1 \
 RUN:   | FileCheck %s --check-prefix=NO-ARCHIVE
 
-NO-ARCHIVE: error: An archive name must be specified.
+NO-ARCHIVE: error: an archive name must be specified
 
 # Archive does not exist:
 RUN: not llvm-ar p %t/missing.a 2>&1 \
 RUN:   | FileCheck %s --check-prefix=MISSING-ARCHIVE -DARCHIVE=%t/missing.a
 
-MISSING-ARCHIVE: error: error loading '[[ARCHIVE]]': {{[nN]}}o such file or directory.
+MISSING-ARCHIVE: error: error loading '[[ARCHIVE]]': {{[nN]}}o such file or directory
 
 # Member does not exist:
 RUN: not llvm-ar p %t/archive.a %t-missing.txt 2>&1 \
 RUN:   | FileCheck %s --check-prefix=MISSING-FILE -DFILE=%t-missing.txt
 
 MISSING-FILE: error: '[[FILE]]' was not found

test/tools/llvm-ar/quick-append.test

 # RUN: llvm-ar t %t/without.a | count 0
 
 # RUN: llvm-nm --print-armap %t/without.a | count 0
 
 ## No archive:
 # RUN: not llvm-ar qc 2>&1 \
 # RUN:   | FileCheck %s --check-prefix=NO-ARCHIVE
 
-# NO-ARCHIVE: error: An archive name must be specified.
+# NO-ARCHIVE: error: an archive name must be specified
 
 ## Member does not exist:
 # RUN: not llvm-ar qc %t/missing.a %t/missing.txt 2>&1 \
 # RUN:   | FileCheck %s --check-prefix=MISSING-FILE -DFILE=%t/missing.txt
 
-# MISSING-FILE: error: [[FILE]]: {{[nN]}}o such file or directory.
+# MISSING-FILE: error: [[FILE]]: {{[nN]}}o such file or directory
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_X86_64
 Sections:

test/tools/llvm-ar/read-only-archive.test

 ## Test that read-only archives cannot be edited
 
 # RUN: rm -rf %t && mkdir -p %t
 # RUN: touch %t/1.txt
 # RUN: touch %t/2.txt
 # RUN: touch %t/3.txt
 
 # RUN: llvm-ar rc %t/archive.a %t/1.txt %t/2.txt
 
 ## Make read only:
 # RUN: chmod 444 %t/archive.a
 
 # RUN: not llvm-ar r %t/archive.a %t/3.txt \
 # RUN:   FileCheck %s --check-prefix=ERROR -DFILE=%t/archive.a
 
-# ERROR: error: [[FILE]]: no such file or directory.
+# ERROR: error: [[FILE]]: no such file or directory
 
 # RUN: not llvm-ar q %t/archive.a %t/3.txt \
 # RUN:   FileCheck %s --check-prefix=ERROR -DFILE=%t/archive.a
 
 # RUN: not llvm-ar m %t/archive.a t/1.txt \
 # RUN:   FileCheck %s --check-prefix=ERROR-2 -DFILE=%t/archive.a
 
-# ERROR-2: error: [[FILE]]: permission denied.
+# ERROR-2: error: [[FILE]]: permission denied
 
 # RUN: llvm-ar t %t/archive.a \
 # RUN:   | FileCheck %s --check-prefix=ARCHIVE --match-full-lines --implicit-check-not {{.}}
 
 # ARCHIVE: 1.txt
 # ARCHIVE-NEXT: 2.txt

test/tools/llvm-ar/replace.test

 # WITHOUT-SYM:      symbol1
 # WITHOUT-SYM-NEXT: symbol2
 # WITHOUT-SYM-NEXT: symbol3
 
 ## No archive:
 # RUN: not llvm-ar r 2>&1 \
 # RUN:   | FileCheck %s --check-prefix=NO-ARCHIVE
 
-# NO-ARCHIVE: error: An archive name must be specified.
+# NO-ARCHIVE: error: an archive name must be specified
 
 ## Member does not exist:
 # RUN: llvm-ar rc %t/missing.a %t/1.o %t/2.o %t/3.o
 # RUN: not llvm-ar r %t/missing.a %t/missing.txt 2>&1 \
 # RUN:   | FileCheck %s --check-prefix=MISSING-FILE -DFILE=%t/missing.txt
 
-# MISSING-FILE: error: [[FILE]]: {{[Nn]}}o such file or directory.
+# MISSING-FILE: error: [[FILE]]: {{[Nn]}}o such file or directory
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_X86_64
 Sections:

tools/llvm-ar/llvm-ar.cpp

void printHelpMessage() {
   if (Stem.contains_lower("ranlib"))
     outs() << RanlibHelp;
   else if (Stem.contains_lower("ar"))
     outs() << ArHelp;
 }
 
 // Show the error message and exit.
 LLVM_ATTRIBUTE_NORETURN static void fail(Twine Error) {
-  WithColor::error(errs(), ToolName) << Error << ".\n";
+  WithColor::error(errs(), ToolName) << Error << "\n";
   printHelpMessage();
   exit(1);
 }
 
 static void failIfError(std::error_code EC, Twine Context = "") {
   if (!EC)
     return;
 

 
 // Static buffer to hold StringRefs.
 static BumpPtrAllocator Alloc;
 
 // Extract the member filename from the command line for the [relpos] argument
 // associated with a, b, and i modifiers
 static void getRelPos() {
   if (PositionalArgs.empty())
-    fail("Expected [relpos] for a, b, or i modifier");
+    fail("expected [relpos] for a, b, or i modifier");
   RelPos = PositionalArgs[0];
   PositionalArgs.erase(PositionalArgs.begin());
 }
 
 // Extract the parameter from the command line for the [count] argument
 // associated with the N modifier
 static void getCountParam() {
   if (PositionalArgs.empty())
-    fail("Expected [count] for N modifier");
+    fail("expected [count] for N modifier");
   auto CountParamArg = StringRef(PositionalArgs[0]);
   if (CountParamArg.getAsInteger(10, CountParam))
-    fail("Value for [count] must be numeric, got: " + CountParamArg);
+    fail("value for [count] must be numeric, got: " + CountParamArg);
   if (CountParam < 1)
-    fail("Value for [count] must be positive, got: " + CountParamArg);
+    fail("value for [count] must be positive, got: " + CountParamArg);
   PositionalArgs.erase(PositionalArgs.begin());
 }
 
 // Get the archive file name from the command line
 static void getArchive() {
   if (PositionalArgs.empty())
-    fail("An archive name must be specified");
+    fail("an archive name must be specified");
   ArchiveName = PositionalArgs[0];
   PositionalArgs.erase(PositionalArgs.begin());
 }
 
 // Copy over remaining items in PositionalArgs to our Members vector
 static void getMembers() {
   for (auto &Arg : PositionalArgs)
     Members.push_back(Arg);
 }
 
 std::vector<std::unique_ptr<MemoryBuffer>> ArchiveBuffers;
 std::vector<std::unique_ptr<object::Archive>> Archives;
 
 static object::Archive &readLibrary(const Twine &Library) {
   auto BufOrErr = MemoryBuffer::getFile(Library, -1, false);
-  failIfError(BufOrErr.getError(), "Could not open library " + Library);
+  failIfError(BufOrErr.getError(), "could not open library " + Library);
   ArchiveBuffers.push_back(std::move(*BufOrErr));
   auto LibOrErr =
       object::Archive::create(ArchiveBuffers.back()->getMemBufferRef());
   failIfError(errorToErrorCode(LibOrErr.takeError()),
-              "Could not parse library");
+              "could not parse library");
   Archives.push_back(std::move(*LibOrErr));
   return *Archives.back();
 }
 
 static void runMRIScript();
 
 // Parse the command line options as presented and return the operation
 // specified. Process all modifiers and check to make sure that constraints on
 // modifier/operation pairs have not been violated.
 static ArchiveOperation parseCommandLine() {
   if (MRI) {
     if (!PositionalArgs.empty() || !Options.empty())
-      fail("Cannot mix -M and other options");
+      fail("cannot mix -M and other options");
     runMRIScript();
   }
 
   // Keep track of number of operations. We can only specify one
   // per execution.
   unsigned NumOperations = 0;
 
   // Keep track of the number of positional modifiers (a,b,i). Only
static ArchiveOperation parseCommandLine() {
 
   // Everything on the command line at this point is a member.
   getMembers();
 
   if (NumOperations == 0 && MaybeJustCreateSymTab) {
     NumOperations = 1;
     Operation = CreateSymTab;
     if (!Members.empty())
-      fail("The s operation takes only an archive as argument");
+      fail("the 's' operation takes only an archive as argument");
   }
 
   // Perform various checks on the operation/modifier specification
   // to make sure we are dealing with a legal request.
   if (NumOperations == 0)
-    fail("You must specify at least one of the operations");
+    fail("you must specify at least one of the operations");
   if (NumOperations > 1)
-    fail("Only one operation may be specified");
+    fail("only one operation may be specified");
   if (NumPositional > 1)
-    fail("You may only specify one of a, b, and i modifiers");
+    fail("you may only specify one of 'a', 'b', and 'i' modifiers");
   if (AddAfter || AddBefore)
     if (Operation != Move && Operation != ReplaceOrInsert)
-      fail("The 'a', 'b' and 'i' modifiers can only be specified with "
+      fail("the 'a', 'b' and 'i' modifiers can only be specified with "
            "the 'm' or 'r' operations");
   if (CountParam)
     if (Operation != Extract && Operation != Delete)
-      fail("The 'N' modifier can only be specified with the 'x' or 'd' "
+      fail("the 'N' modifier can only be specified with the 'x' or 'd' "
            "operations");
   if (OriginalDates && Operation != Extract)
-    fail("The 'o' modifier is only applicable to the 'x' operation");
+    fail("the 'o' modifier is only applicable to the 'x' operation");
   if (OnlyUpdate && Operation != ReplaceOrInsert)
-    fail("The 'u' modifier is only applicable to the 'r' operation");
+    fail("the 'u' modifier is only applicable to the 'r' operation");
   if (AddLibrary && Operation != QuickAppend)
-    fail("The 'L' modifier is only applicable to the 'q' operation");
+    fail("the 'L' modifier is only applicable to the 'q' operation");
 
   // Return the parsed operation to the caller
   return Operation;
 }
 
 // Implements the 'p' operation. This function traverses the archive
 // looking for members that match the path list.
 static void doPrint(StringRef Name, const object::Archive::Child &C) {
for (StringRef Name : Members)
     WithColor::error(errs(), ToolName) << "'" << Name << "' was not found\n";
   exit(1);
 }
 
 static void addChildMember(std::vector<NewArchiveMember> &Members,
                            const object::Archive::Child &M,
                            bool FlattenArchive = false) {
   if (Thin && !M.getParent()->isThin())
-    fail("Cannot convert a regular archive to a thin one");
+    fail("cannot convert a regular archive to a thin one");
   Expected<NewArchiveMember> NMOrErr =
       NewArchiveMember::getOldMember(M, Deterministic);
   failIfError(NMOrErr.takeError());
   // If the child member we're trying to add is thin, use the path relative to
   // the archive it's in, so the file resolves correctly.
   if (Thin && FlattenArchive) {
     StringSaver Saver(Alloc);
     Expected<std::string> FileNameOrErr = M.getName();
if (OldArchive) {
     }
     failIfError(std::move(Err));
   }
 
   if (Operation == Delete)
     return Ret;
 
   if (!RelPos.empty() && InsertPos == -1)
-    fail("Insertion point not found");
+    fail("insertion point not found");
 
   if (RelPos.empty())
     InsertPos = Ret.size();
 
   assert(unsigned(InsertPos) <= Ret.size());
   int Pos = InsertPos;
   for (auto &M : Moved) {
     Ret.insert(Ret.begin() + Pos, std::move(M));
else
       Kind = !NewMembers.empty() ? getKindFromMember(NewMembers.front())
                                  : getDefaultForHost();
     break;
   case GNU:
     Kind = object::Archive::K_GNU;
     break;
   case BSD:
     if (Thin)
-      fail("Only the gnu format has a thin mode");
+      fail("only the gnu format has a thin mode");
     Kind = object::Archive::K_BSD;
     break;
   case DARWIN:
     if (Thin)
-      fail("Only the gnu format has a thin mode");
+      fail("only the gnu format has a thin mode");
     Kind = object::Archive::K_DARWIN;
     break;
   case Unknown:
     llvm_unreachable("");
   }
 
   Error E =
       writeArchive(ArchiveName, NewMembersP ? *NewMembersP : NewMembers, Symtab,

 
 static int performOperation(ArchiveOperation Operation,
                             std::vector<NewArchiveMember> *NewMembers) {
   // Create or open the archive object.
   ErrorOr<std::unique_ptr<MemoryBuffer>> Buf =
       MemoryBuffer::getFile(ArchiveName, -1, false);
   std::error_code EC = Buf.getError();
   if (EC && EC != errc::no_such_file_or_directory)
-    fail("error opening '" + ArchiveName + "': " + EC.message() + "!");
+    fail("error opening '" + ArchiveName + "': " + EC.message());
 
   if (!EC) {
     Error Err = Error::success();
     object::Archive Archive(Buf.get()->getMemBufferRef(), Err);
     EC = errorToErrorCode(std::move(Err));
-    failIfError(EC,
-                "error loading '" + ArchiveName + "': " + EC.message() + "!");
+    failIfError(EC, "error loading '" + ArchiveName + "': " + EC.message());
     if (Archive.isThin())
       CompareFullPath = true;
     performOperation(Operation, &Archive, std::move(Buf.get()), NewMembers);
     return 0;
   }
 
   assert(EC == errc::no_such_file_or_directory);
 
case MRICommand::AddMod:
       addMember(NewMembers, Rest);
       break;
     case MRICommand::CreateThin:
       Thin = true;
       LLVM_FALLTHROUGH;
     case MRICommand::Create:
       Create = true;
       if (!ArchiveName.empty())
-        fail("Editing multiple archives not supported");
+        fail("editing multiple archives not supported");
       if (Saved)
-        fail("File already saved");
+        fail("file already saved");
       ArchiveName = Rest;
       break;
     case MRICommand::Delete: {
       std::string Name = normalizePath(Rest);
       llvm::erase_if(NewMembers,
                      [=](NewArchiveMember &M) { return M.MemberName == Name; });
       break;
     }
     case MRICommand::Save:
       Saved = true;
       break;
     case MRICommand::End:
       break;
     case MRICommand::Invalid:
-      fail("Unknown command: " + CommandStr);
+      fail("unknown command: " + CommandStr);
     }
   }
 
   // Nothing to do if not saved.
   if (Saved)
     performOperation(ReplaceOrInsert, &NewMembers);
   exit(0);
 }

 
 static int ranlib_main(int argc, char **argv) {
   bool ArchiveSpecified = false;
   for (int i = 1; i < argc; ++i) {
     if (handleGenericOption(argv[i])) {
       return 0;
     } else {
       if (ArchiveSpecified)
-        fail("Exactly one archive should be specified");
+        fail("exactly one archive should be specified");
       ArchiveSpecified = true;
       ArchiveName = argv[i];
     }
   }
   return performOperation(CreateSymTab, nullptr);
 }
 
 int main(int argc, char **argv) {
int main(int argc, char **argv) {
   if (Stem.contains_lower("ranlib"))
     return ranlib_main(argc, argv);
 
   if (Stem.contains_lower("lib"))
     return libDriverMain(makeArrayRef(argv, argc));
 
   if (Stem.contains_lower("ar"))
     return ar_main(argc, argv);
-  fail("Not ranlib, ar, lib or dlltool!");
+  fail("not ranlib, ar, lib or dlltool");
 }