Merge IWYU from core

include/yaml-cpp/emitfromevents.h

@@ -7,9 +7,15 @@
 #pragma once
 #endif
 
-#include "yaml-cpp/eventhandler.h"
 #include <stack>
 
+#include "yaml-cpp/anchor.h"
+#include "yaml-cpp/eventhandler.h"
+
+namespace YAML {
+struct Mark;
+}  // namespace YAML
+
 namespace YAML {
 class Emitter;
 

include/yaml-cpp/emitter.h

@@ -7,16 +7,22 @@
 #pragma once
 #endif
 
-#include "yaml-cpp/dll.h"
+#include <memory>
+#include <sstream>
+#include <string>
+
 #include "yaml-cpp/binary.h"
+#include "yaml-cpp/dll.h"
 #include "yaml-cpp/emitterdef.h"
 #include "yaml-cpp/emittermanip.h"
 #include "yaml-cpp/noncopyable.h"
 #include "yaml-cpp/null.h"
 #include "yaml-cpp/ostream_wrapper.h"
-#include <memory>
-#include <string>
-#include <sstream>
+
+namespace YAML {
+class Binary;
+struct _Null;
+}  // namespace YAML
 
 namespace YAML {
 class EmitterState;

include/yaml-cpp/parser.h

@@ -7,16 +7,18 @@
 #pragma once
 #endif
 
-#include "yaml-cpp/dll.h"
-#include "yaml-cpp/noncopyable.h"
 #include <ios>
 #include <memory>
 
+#include "yaml-cpp/dll.h"
+#include "yaml-cpp/noncopyable.h"
+
 namespace YAML {
+class EventHandler;
+class Node;
+class Scanner;
 struct Directives;
 struct Token;
-class EventHandler;
-class Scanner;
 
 class YAML_CPP_API Parser : private noncopyable {
  public:

src/contrib/graphbuilder.cpp

@@ -1,8 +1,10 @@
-#include "yaml-cpp/parser.h"
-#include "yaml-cpp/contrib/graphbuilder.h"
 #include "graphbuilderadapter.h"
 
+#include "yaml-cpp/parser.h"  // IWYU pragma: keep
+
 namespace YAML {
+class GraphBuilderInterface;
+
 void* BuildGraphOfNextDocument(Parser& parser,
                                GraphBuilderInterface& graphBuilder) {
   GraphBuilderAdapter eventHandler(graphBuilder);

src/contrib/graphbuilderadapter.cpp

@@ -1,6 +1,9 @@
 #include "graphbuilderadapter.h"
+#include "yaml-cpp/contrib/graphbuilder.h"
 
 namespace YAML {
+struct Mark;
+
 int GraphBuilderAdapter::ContainerFrame::sequenceMarker;
 
 void GraphBuilderAdapter::OnNull(const Mark &mark, anchor_t anchor) {

src/contrib/graphbuilderadapter.h

@@ -10,9 +10,16 @@
 #include <cstdlib>
 #include <map>
 #include <stack>
-#include "yaml-cpp/eventhandler.h"
+
+#include "yaml-cpp/anchor.h"
 #include "yaml-cpp/contrib/anchordict.h"
 #include "yaml-cpp/contrib/graphbuilder.h"
+#include "yaml-cpp/eventhandler.h"
+
+namespace YAML {
+class GraphBuilderInterface;
+struct Mark;
+}  // namespace YAML
 
 namespace YAML {
 class GraphBuilderAdapter : public EventHandler {

src/emitfromevents.cpp

@@ -1,9 +1,15 @@
-#include "yaml-cpp/emitfromevents.h"
-#include "yaml-cpp/emitter.h"
-#include "yaml-cpp/null.h"
 #include <cassert>
 #include <sstream>
 
+#include "yaml-cpp/emitfromevents.h"
+#include "yaml-cpp/emitter.h"
+#include "yaml-cpp/emittermanip.h"
+#include "yaml-cpp/null.h"
+
+namespace YAML {
+struct Mark;
+}  // namespace YAML
+
 namespace {
 std::string ToString(YAML::anchor_t anchor) {
   std::stringstream stream;

src/emitter.cpp

@@ -1,11 +1,16 @@
-#include "yaml-cpp/emitter.h"
-#include "emitterstate.h"
-#include "emitterutils.h"
-#include "indentation.h"
-#include "yaml-cpp/exceptions.h"
 #include <sstream>
 
+#include "emitterutils.h"
+#include "indentation.h"  // IWYU pragma: keep
+#include "yaml-cpp/emitter.h"
+#include "yaml-cpp/emitterdef.h"
+#include "yaml-cpp/emittermanip.h"
+#include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
+
 namespace YAML {
+class Binary;
+struct _Null;
+
 Emitter::Emitter() : m_pState(new EmitterState) {}
 
 Emitter::Emitter(std::ostream& stream)

src/emitterstate.cpp

@@ -1,7 +1,8 @@
-#include "emitterstate.h"
-#include "yaml-cpp/exceptions.h"
 #include <limits>
 
+#include "emitterstate.h"
+#include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
+
 namespace YAML {
 EmitterState::EmitterState()
     : m_isGood(true),

src/emitterutils.cpp

@@ -1,11 +1,14 @@
+#include <iomanip>
+#include <sstream>
+
 #include "emitterutils.h"
 #include "exp.h"
 #include "indentation.h"
-#include "yaml-cpp/binary.h"
-#include "yaml-cpp/exceptions.h"
+#include "regex_yaml.h"
+#include "regeximpl.h"
 #include "stringsource.h"
-#include <sstream>
-#include <iomanip>
+#include "yaml-cpp/binary.h"  // IWYU pragma: keep
+#include "yaml-cpp/ostream_wrapper.h"
 
 namespace YAML {
 namespace Utils {

src/emitterutils.h

@@ -7,10 +7,16 @@
 #pragma once
 #endif
 
-#include "emitterstate.h"
-#include "yaml-cpp/ostream_wrapper.h"
 #include <string>
 
+#include "emitterstate.h"
+#include "yaml-cpp/emittermanip.h"
+#include "yaml-cpp/ostream_wrapper.h"
+
+namespace YAML {
+class ostream_wrapper;
+}  // namespace YAML
+
 namespace YAML {
 class Binary;
 

src/exp.cpp

@@ -1,7 +1,13 @@
-#include "exp.h"
-#include "yaml-cpp/exceptions.h"
 #include <sstream>
 
+#include "exp.h"
+#include "stream.h"
+#include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
+
+namespace YAML {
+struct Mark;
+}  // namespace YAML
+
 namespace YAML {
 namespace Exp {
 unsigned ParseHex(const std::string& str, const Mark& mark) {

src/exp.h

@@ -7,9 +7,10 @@
 #pragma once
 #endif
 
-#include "regex_yaml.h"
-#include <string>
 #include <ios>
+#include <string>
+
+#include "regex_yaml.h"
 #include "stream.h"
 
 namespace YAML {

src/parser.cpp

@@ -1,15 +1,16 @@
-#include "yaml-cpp/parser.h"
-#include "yaml-cpp/eventhandler.h"
-#include "yaml-cpp/exceptions.h"
-#include "directives.h"
-#include "scanner.h"
-#include "singledocparser.h"
-#include "tag.h"
-#include "token.h"
-#include <sstream>
 #include <cstdio>
+#include <sstream>
+
+#include "directives.h"  // IWYU pragma: keep
+#include "scanner.h"  // IWYU pragma: keep
+#include "singledocparser.h"
+#include "token.h"
+#include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
+#include "yaml-cpp/parser.h"
 
 namespace YAML {
+class EventHandler;
+
 Parser::Parser() {}
 
 Parser::Parser(std::istream& in) { Load(in); }

src/regex_yaml.h

@@ -7,8 +7,8 @@
 #pragma once
 #endif
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace YAML {
 class Stream;

src/scanner.cpp

@@ -1,10 +1,11 @@
-#include "scanner.h"
-#include "token.h"
-#include "yaml-cpp/exceptions.h"
-#include "exp.h"
 #include <cassert>
 #include <memory>
 
+#include "exp.h"
+#include "scanner.h"
+#include "token.h"
+#include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
+
 namespace YAML {
 Scanner::Scanner(std::istream& in)
     : INPUT(in),

src/scanner.h

@@ -8,14 +8,16 @@
 #endif
 
 #include <ios>
-#include <string>
-#include <queue>
-#include <stack>
-#include <set>
 #include <map>
+#include <queue>
+#include <set>
+#include <stack>
+#include <string>
+
 #include "ptr_vector.h"
 #include "stream.h"
 #include "token.h"
+#include "yaml-cpp/mark.h"
 
 namespace YAML {
 class Node;

src/scanscalar.cpp

@@ -1,8 +1,8 @@
-#include "scanscalar.h"
-#include "scanner.h"
 #include "exp.h"
-#include "yaml-cpp/exceptions.h"
-#include "token.h"
+#include "regeximpl.h"
+#include "scanscalar.h"
+#include "stream.h"
+#include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
 
 namespace YAML {
 // ScanScalar

src/scanscalar.h

@@ -8,6 +8,7 @@
 #endif
 
 #include <string>
+
 #include "regex_yaml.h"
 #include "stream.h"
 

src/scantag.cpp

@@ -1,7 +1,9 @@
-#include "scanner.h"
-#include "regex_yaml.h"
 #include "exp.h"
-#include "yaml-cpp/exceptions.h"
+#include "regex_yaml.h"
+#include "regeximpl.h"
+#include "stream.h"
+#include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
+#include "yaml-cpp/mark.h"
 
 namespace YAML {
 const std::string ScanVerbatimTag(Stream& INPUT) {