summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2016-03-13 09:36:24 +0800
committerJohn Hodge <tpg@mutabah.net>2016-03-13 09:36:24 +0800
commitf6c69a1089e2246156e65c0173a14306935733f3 (patch)
treec9ea3b04fc780690acabfc673646584a2fb0cde0
parentdf7f0e6e1b384496a0d198557d73359085f46d47 (diff)
downloadmrust-f6c69a1089e2246156e65c0173a14306935733f3.tar.gz
Expand - Move synexts/*.cpp to expand/
-rw-r--r--Makefile5
-rw-r--r--src/expand/derive.cpp (renamed from src/synexts/derive.cpp)0
-rw-r--r--src/expand/lang_item.cpp (renamed from src/synexts/lang_item.cpp)0
3 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 56d1496b..d6009aa6 100644
--- a/Makefile
+++ b/Makefile
@@ -29,13 +29,14 @@ OBJ += ast/ast.o ast/crate.o ast/path.o ast/expr.o ast/pattern.o
OBJ += ast/provided_module.o
OBJ += parse/parseerror.o parse/lex.o
OBJ += parse/root.o parse/paths.o parse/types.o parse/expr.o parse/pattern.o parse/macro_rules.o
-OBJ += expand/mod.o expand/macro_rules.o expand/cfg.o expand/format_args.o
+OBJ += expand/mod.o expand/macro_rules.o expand/cfg.o
+OBJ += expand/format_args.o
OBJ += expand/concat.o expand/stringify.o expand/file_line.o
+OBJ += expand/derive.o expand/lang_item.o
OBJ += dump_as_rust.o
OBJ += convert/ast_iterate.o
#OBJ += convert/decorators.o
OBJ += convert/resolve.o convert/typecheck_bounds.o convert/typecheck_params.o convert/typecheck_expr.o
-OBJ += synexts/derive.o synexts/lang_item.o
PCHS := ast/ast.hpp
diff --git a/src/synexts/derive.cpp b/src/expand/derive.cpp
index e4c10f4e..e4c10f4e 100644
--- a/src/synexts/derive.cpp
+++ b/src/expand/derive.cpp
diff --git a/src/synexts/lang_item.cpp b/src/expand/lang_item.cpp
index 3df3a54f..3df3a54f 100644
--- a/src/synexts/lang_item.cpp
+++ b/src/expand/lang_item.cpp