refactor(library/error_handling): move error_handling to library main dir

src/CMakeLists.txt

@@ -361,8 +361,6 @@ add_subdirectory(library/blast/grinder)
 set(LEAN_OBJS ${LEAN_OBJS} $<TARGET_OBJECTS:blast_grinder>)
 add_subdirectory(library/blast/simplifier)
 set(LEAN_OBJS ${LEAN_OBJS} $<TARGET_OBJECTS:simplifier>)
-add_subdirectory(library/error_handling)
-set(LEAN_OBJS ${LEAN_OBJS} $<TARGET_OBJECTS:error_handling>)
 add_subdirectory(compiler)
 set(LEAN_OBJS ${LEAN_OBJS} $<TARGET_OBJECTS:compiler>)
 add_subdirectory(frontends/lean)

src/api/exception.cpp

@@ -8,7 +8,7 @@ Author: Leonardo de Moura
 #include "library/unifier.h"
 #include "library/print.h"
 #include "library/tactic/tactic.h"
-#include "library/error_handling/error_handling.h"
+#include "library/error_handling.h"
 #include "api/exception.h"
 #include "api/string.h"
 using namespace lean; // NOLINT

src/api/ios.cpp

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "library/error_handling/error_handling.h"
+#include "library/error_handling.h"
 #include "frontends/lean/pp.h"
 #include "api/string.h"
 #include "api/exception.h"

src/frontends/lean/decl_cmds.cpp

@@ -22,7 +22,7 @@ Author: Leonardo de Moura
 #include "library/explicit.h"
 #include "library/abbreviation.h"
 #include "library/definitional/equations.h"
-#include "library/error_handling/error_handling.h"
+#include "library/error_handling.h"
 #include "frontends/lean/parser.h"
 #include "frontends/lean/util.h"
 #include "frontends/lean/tokens.h"

src/frontends/lean/elaborator.cpp

@@ -41,7 +41,7 @@ Author: Leonardo de Moura
 #include "library/pp_options.h"
 #include "library/class_instance_resolution.h"
 #include "library/tactic/expr_to_tactic.h"
-#include "library/error_handling/error_handling.h"
+#include "library/error_handling.h"
 #include "library/definitional/equations.h"
 #include "frontends/lean/local_decls.h"
 #include "frontends/lean/structure_cmd.h"

src/frontends/lean/parser.cpp

@@ -41,7 +41,7 @@ Author: Leonardo de Moura
 #include "library/flycheck.h"
 #include "library/pp_options.h"
 #include "library/noncomputable.h"
-#include "library/error_handling/error_handling.h"
+#include "library/error_handling.h"
 #include "library/tactic/expr_to_tactic.h"
 #include "library/tactic/location.h"
 #include "frontends/lean/tokens.h"

src/library/CMakeLists.txt

@@ -19,4 +19,4 @@ add_library(library OBJECT deep_copy.cpp expr_lt.cpp io_state.cpp
   norm_num.cpp class_instance_resolution.cpp type_context.cpp
   tmp_type_context.cpp fun_info_manager.cpp congr_lemma_manager.cpp
   abstract_expr_manager.cpp light_lt_manager.cpp trace.cpp
-  attribute_manager.cpp)
+  attribute_manager.cpp error_handling.cpp)

src/library/error_handling.cpp

@@ -15,7 +15,7 @@ Author: Leonardo de Moura
 #include "library/parser_nested_exception.h"
 #include "library/flycheck.h"
 #include "library/pp_options.h"
-#include "library/error_handling/error_handling.h"
+#include "library/error_handling.h"
 
 namespace lean {
 void display_pos(std::ostream & out, options const & o, char const * strm_name, unsigned line, unsigned pos) {

src/library/error_handling/CMakeLists.txt

@@ -1 +0,0 @@
-add_library(error_handling OBJECT error_handling.cpp)

src/shell/emscripten.cpp

@@ -10,7 +10,7 @@ Author: Leonardo de Moura
 #include "library/module.h"
 #include "library/standard_kernel.h"
 #include "library/kernel_bindings.h"
-#include "library/error_handling/error_handling.h"
+#include "library/error_handling.h"
 #include "frontends/lean/pp.h"
 #include "frontends/lean/parser.h"
 #include "init/init.h"

src/shell/lean.cpp

@@ -34,7 +34,7 @@ Author: Leonardo de Moura
 #include "library/definition_cache.h"
 #include "library/declaration_index.h"
 #include "library/export.h"
-#include "library/error_handling/error_handling.h"
+#include "library/error_handling.h"
 #include "frontends/lean/parser.h"
 #include "frontends/lean/pp.h"
 #include "frontends/lean/server.h"