[Remarks][NFC] Rename remarks::Serializer to remarks::RemarkSerializer

llvm-svn: 366939

3 files changed, 15 insertions, 15 deletions

diff --git a/llvm/include/llvm/IR/RemarkStreamer.h b/llvm/include/llvm/IR/RemarkStreamer.h
index f34cc660b2f..7b2fc95d15e 100644
--- a/llvm/include/llvm/IR/RemarkStreamer.h
+++ b/llvm/include/llvm/IR/RemarkStreamer.h
@@ -30,7 +30,7 @@ class RemarkStreamer {
   /// The regex used to filter remarks based on the passes that emit them.
   Optional<Regex> PassFilter;
   /// The object used to serialize the remarks to a specific format.
-  std::unique_ptr<remarks::Serializer> Serializer;
+  std::unique_ptr<remarks::RemarkSerializer> RemarkSerializer;
 
   /// Convert diagnostics into remark objects.
   /// The lifetime of the members of the result is bound to the lifetime of
@@ -39,13 +39,13 @@ class RemarkStreamer {
 
 public:
   RemarkStreamer(StringRef Filename,
-                 std::unique_ptr<remarks::Serializer> Serializer);
+                 std::unique_ptr<remarks::RemarkSerializer> RemarkSerializer);
   /// Return the filename that the remark diagnostics are emitted to.
   StringRef getFilename() const { return Filename; }
   /// Return stream that the remark diagnostics are emitted to.
-  raw_ostream &getStream() { return Serializer->OS; }
+  raw_ostream &getStream() { return RemarkSerializer->OS; }
   /// Return the serializer used for this stream.
-  remarks::Serializer &getSerializer() { return *Serializer; }
+  remarks::RemarkSerializer &getSerializer() { return *RemarkSerializer; }
   /// Set a pass filter based on a regex \p Filter.
   /// Returns an error if the regex is invalid.
   Error setFilter(StringRef Filter);
diff --git a/llvm/include/llvm/Remarks/RemarkSerializer.h b/llvm/include/llvm/Remarks/RemarkSerializer.h
index cf12a9af7c8..362d81b459d 100644
--- a/llvm/include/llvm/Remarks/RemarkSerializer.h
+++ b/llvm/include/llvm/Remarks/RemarkSerializer.h
@@ -22,26 +22,26 @@ namespace remarks {
 
 /// This is the base class for a remark serializer.
 /// It includes support for using a string table while emitting.
-struct Serializer {
+struct RemarkSerializer {
   /// The open raw_ostream that the remark diagnostics are emitted to.
   raw_ostream &OS;
   /// The string table containing all the unique strings used in the output.
   /// The table can be serialized to be consumed after the compilation.
   Optional<StringTable> StrTab;
 
-  Serializer(raw_ostream &OS) : OS(OS), StrTab() {}
+  RemarkSerializer(raw_ostream &OS) : OS(OS), StrTab() {}
 
   /// This is just an interface.
-  virtual ~Serializer() = default;
+  virtual ~RemarkSerializer() = default;
   virtual void emit(const Remark &Remark) = 0;
 };
 
 /// Create a remark serializer.
-Expected<std::unique_ptr<Serializer>>
+Expected<std::unique_ptr<RemarkSerializer>>
 createRemarkSerializer(Format RemarksFormat, raw_ostream &OS);
 
 /// Create a remark serializer that uses a pre-filled string table.
-Expected<std::unique_ptr<Serializer>>
+Expected<std::unique_ptr<RemarkSerializer>>
 createRemarkSerializer(Format RemarksFormat, raw_ostream &OS,
                        remarks::StringTable StrTab);
 
diff --git a/llvm/include/llvm/Remarks/YAMLRemarkSerializer.h b/llvm/include/llvm/Remarks/YAMLRemarkSerializer.h
index 0d8d39cfdbc..cc09805a335 100644
--- a/llvm/include/llvm/Remarks/YAMLRemarkSerializer.h
+++ b/llvm/include/llvm/Remarks/YAMLRemarkSerializer.h
@@ -30,11 +30,11 @@ namespace remarks {
 ///   - <KEY>: <VALUE>
 ///     DebugLoc:        { File: <FILE>, Line: <LINE>, Column: <COL> }
 /// ...
-struct YAMLSerializer : public Serializer {
+struct YAMLRemarkSerializer : public RemarkSerializer {
   /// The YAML streamer.
   yaml::Output YAMLOutput;
 
-  YAMLSerializer(raw_ostream &OS);
+  YAMLRemarkSerializer(raw_ostream &OS);
 
   /// Emit a remark to the stream.
   void emit(const Remark &Remark) override;
@@ -43,13 +43,13 @@ struct YAMLSerializer : public Serializer {
 /// Serialize the remarks to YAML using a string table. An remark entry looks
 /// like the regular YAML remark but instead of string entries it's using
 /// numbers that map to an index in the string table.
-struct YAMLStrTabSerializer : public YAMLSerializer {
-  YAMLStrTabSerializer(raw_ostream &OS) : YAMLSerializer(OS) {
+struct YAMLStrTabRemarkSerializer : public YAMLRemarkSerializer {
+  YAMLStrTabRemarkSerializer(raw_ostream &OS) : YAMLRemarkSerializer(OS) {
     // Having a string table set up enables the serializer to use it.
     StrTab.emplace();
   }
-  YAMLStrTabSerializer(raw_ostream &OS, StringTable StrTabIn)
-      : YAMLSerializer(OS) {
+  YAMLStrTabRemarkSerializer(raw_ostream &OS, StringTable StrTabIn)
+      : YAMLRemarkSerializer(OS) {
     StrTab = std::move(StrTabIn);
   }
 };