From aadb0afb4afbff78fcfb96a2fc26cf53bfec327a Mon Sep 17 00:00:00 2001
From: Sameer Arora <sameerarora101@fb.com>
Date: Fri, 5 Jun 2020 10:29:24 -0700
Subject: [PATCH] [llvm-ar] Update error messages and tests as per latest
 preferred style

It updates two error messages under `performOperation` in the file
llvm-ar.cpp. Furthermore, it also updates tests that print out these
error messages: `llvm/test/Object/ar-create.test` and
`llvm/test/tools/llvm-ar/print.test`.

Reviewed By: jhenderson, MaskRay

Differential Revision: https://reviews.llvm.org/D80846
---
 test/Object/ar-create.test                       |  2 +-
 test/tools/llvm-ar/error-opening-directory.test  |  2 +-
 test/tools/llvm-ar/error-opening-permission.test |  2 +-
 test/tools/llvm-ar/print.test                    |  2 +-
 tools/llvm-ar/llvm-ar.cpp                        | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/Object/ar-create.test b/test/Object/ar-create.test
index 4b08c97317a..07c9ba43735 100644
--- a/test/Object/ar-create.test
+++ b/test/Object/ar-create.test
@@ -13,5 +13,5 @@ RUN: rm -f %t.foo.a
 RUN: llvm-ar r %t.foo.a %t 2>&1 | FileCheck --check-prefix=CREATE %s
 RUN: rm -f %t.foo.a
 
-CHECK: llvm-ar{{(.exe|.EXE)?}}: error: error loading '{{[^']+}}.foo.a':
+CHECK: llvm-ar{{(.exe|.EXE)?}}: error: unable to load '{{[^']+}}.foo.a':
 CREATE: creating {{.*}}.foo.a
diff --git a/test/tools/llvm-ar/error-opening-directory.test b/test/tools/llvm-ar/error-opening-directory.test
index 63d0c653c37..10cee214183 100644
--- a/test/tools/llvm-ar/error-opening-directory.test
+++ b/test/tools/llvm-ar/error-opening-directory.test
@@ -5,4 +5,4 @@
 # RUN: not llvm-ar p %t/tmpDir 2>&1 | \
 # RUN:    FileCheck %s --check-prefix=IS-DIR -DARCHIVE=%t/tmpDir
 
-# IS-DIR: error: error opening '[[ARCHIVE]]': {{[iI]}}s a directory
+# IS-DIR: error: unable to open '[[ARCHIVE]]': {{[iI]}}s a directory
diff --git a/test/tools/llvm-ar/error-opening-permission.test b/test/tools/llvm-ar/error-opening-permission.test
index e78e76cd951..00f80c0a184 100644
--- a/test/tools/llvm-ar/error-opening-permission.test
+++ b/test/tools/llvm-ar/error-opening-permission.test
@@ -11,4 +11,4 @@
 # RUN: not llvm-ar p %t/permission.b 2>&1 | \
 # RUN:   FileCheck %s --check-prefix=NO-PERMISSION -DARCHIVE=%t/permission.b
 
-# NO-PERMISSION: error: error opening '[[ARCHIVE]]': {{[pP]}}ermission denied
+# NO-PERMISSION: error: unable to open '[[ARCHIVE]]': {{[pP]}}ermission denied
diff --git a/test/tools/llvm-ar/print.test b/test/tools/llvm-ar/print.test
index 847040f419b..247a3d44022 100644
--- a/test/tools/llvm-ar/print.test
+++ b/test/tools/llvm-ar/print.test
@@ -75,7 +75,7 @@
 # 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: unable to load '[[ARCHIVE]]': {{[nN]}}o such file or directory
 
 ## Member does not exist:
 # RUN: not llvm-ar p %t/archive.a %t-missing.txt 2>&1 \
diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp
index 652219568db..d699d4323f0 100644
--- a/tools/llvm-ar/llvm-ar.cpp
+++ b/tools/llvm-ar/llvm-ar.cpp
@@ -520,7 +520,7 @@ static std::string normalizePath(StringRef Path) {
 
 static bool comparePaths(StringRef Path1, StringRef Path2) {
 // When on Windows this function calls CompareStringOrdinal
-// as Windows file paths are case-insensitive. 
+// as Windows file paths are case-insensitive.
 // CompareStringOrdinal compares two Unicode strings for
 // binary equivalence and allows for case insensitivity.
 #ifdef _WIN32
@@ -999,7 +999,7 @@ static int performOperation(ArchiveOperation Operation,
       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("unable to open '" + ArchiveName + "': " + EC.message());
 
   if (!EC) {
     Error Err = Error::success();
@@ -1014,7 +1014,7 @@ static int performOperation(ArchiveOperation Operation,
   assert(EC == errc::no_such_file_or_directory);
 
   if (!shouldCreateArchive(Operation)) {
-    failIfError(EC, Twine("error loading '") + ArchiveName + "'");
+    failIfError(EC, Twine("unable to load '") + ArchiveName + "'");
   } else {
     if (!Create) {
       // Produce a warning if we should and we're creating the archive
@@ -1100,9 +1100,9 @@ static void runMRIScript() {
       fail("unknown command: " + CommandStr);
     }
   }
-  
+
   ParsingMRIScript = false;
-  
+
   // Nothing to do if not saved.
   if (Saved)
     performOperation(ReplaceOrInsert, &NewMembers);