formatting nits

Remove comment that looks like code (unique_ptr should be easy enough to understand).

Co-authored-by: Hubert Tong <[email protected]>

Author: abhina-sree

llvm/cmake/config-ix.cmake

@@ -294,14 +294,14 @@ if(LLVM_HAS_LOGF128)
   set(LLVM_HAS_LOGF128 "${HAS_LOGF128}")
 endif()
 
-#Check for icu.
+# Check for ICU.
 if(LLVM_ENABLE_ICU)
   set(LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
   set(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
   if (LLVM_ENABLE_ICU STREQUAL FORCE_ON)
     find_package(ICU REQUIRED COMPONENTS uc i18n)
     if (NOT ICU_FOUND)
-      message(FATAL_ERROR "Failed to configure icu, but LLVM_ENABLE_ICU is FORCE_ON")
+      message(FATAL_ERROR "Failed to configure ICU, but LLVM_ENABLE_ICU is FORCE_ON")
     endif()
   else()
     find_package(ICU COMPONENTS uc i18n)

llvm/include/llvm/Config/config.h.cmake

@@ -240,7 +240,7 @@
 /* Have host's ___chkstk_ms */
 #cmakedefine HAVE____CHKSTK_MS ${HAVE____CHKSTK_MS}
 
-/* Define if icu library is available */
+/* Define if ICU library is available */
 #cmakedefine HAVE_ICU ${HAVE_ICU}
 
 /* Define if iconv library is available */

llvm/include/llvm/Support/CharSet.h

@@ -46,12 +46,12 @@ class CharSetConverterImplBase {
   ///   - std::errc::invalid_argument: The input contains an incomplete
   ///     multibyte sequence.
   ///
+  /// If the destination charset is a stateful character set, the shift state
+  /// will be set to the initial state.
+  ///
   /// In case of an error, the result string contains the successfully converted
   /// part of the input string.
   ///
-  /// If the destination charset is a stateful character set, the shift state
-  /// will be set to the initial state.
-
   virtual std::error_code convert(StringRef Source,
                                   SmallVectorImpl<char> &Result) const = 0;
 };
@@ -70,16 +70,15 @@ enum class id {
 
 /// Utility class to convert between different character set encodings.
 class CharSetConverter {
-  // details::CharSetConverterImplBase *Converter;
   std::unique_ptr<details::CharSetConverterImplBase> Converter;
 
   CharSetConverter(std::unique_ptr<details::CharSetConverterImplBase> Converter)
       : Converter(std::move(Converter)) {}
 
 public:
   /// Creates a CharSetConverter instance.
-  /// \param[in] CSFrom name of the source character encoding
-  /// \param[in] CSTo name of the target character encoding
+  /// \param[in] CSFrom the source character encoding
+  /// \param[in] CSTo the target character encoding
   /// \return a CharSetConverter instance
   static CharSetConverter create(text_encoding::id CSFrom,
                                  text_encoding::id CSTo);
@@ -95,9 +94,8 @@ class CharSetConverter {
   CharSetConverter(const CharSetConverter &) = delete;
   CharSetConverter &operator=(const CharSetConverter &) = delete;
 
-  CharSetConverter(CharSetConverter &&Other) {
-    Converter = std::move(Other.Converter);
-  }
+  CharSetConverter(CharSetConverter &&Other)
+      : Converter(std::move(Other.Converter)) {}
 
   CharSetConverter &operator=(CharSetConverter &&Other) {
     if (this != &Other)

llvm/lib/Support/CMakeLists.txt

@@ -312,7 +312,7 @@ add_llvm_component_library(LLVMSupport
   Demangle
   )
 
-# Link icu library if it is an external library.
+# Link ICU library if it is an external library.
 if(ICU_FOUND)
   target_link_libraries(LLVMSupport
   PRIVATE

llvm/lib/Support/CharSet.cpp

@@ -8,7 +8,7 @@
 ///
 /// \file
 /// This file provides utility classes to convert between different character
-/// set encoding.
+/// set encodings.
 ///
 //===----------------------------------------------------------------------===//
 
@@ -80,7 +80,7 @@ enum ConversionType {
   IBM1047ToUTF,
 };
 
-// Support conversion between EBCDIC 1047 and UTF8. This class uses
+// Support conversion between EBCDIC 1047 and UTF-8. This class uses
 // built-in translation tables that allow for translation between the
 // aforementioned character sets. The use of tables for conversion is only
 // possible because EBCDIC 1047 is a single-byte, stateless encoding; other
@@ -166,9 +166,8 @@ CharSetConverterICU::convert(StringRef Source,
           Capacity < std::numeric_limits<size_t>::max()) {
         HandleOverflow(Capacity, Output, OutputLength, Result);
         continue;
-      } else
-        // Some other error occured.
-        return std::error_code(EILSEQ, std::generic_category());
+      // Some other error occured.
+      return std::error_code(EILSEQ, std::generic_category());
     }
     break;
   } while (true);