Rename libproc_macro to libproc_macro_internal

The name was a bit misleading since libproc_macro is a rust library that
should we should be able to link against some rust code. This cpp
library was the layer below the libproc_macro library, the "real" gcc
libproc_macro act as a translation layer for the internal library.

gcc/rust/ChangeLog:

	* expand/rust-macro-expand.h: Change include directive with the
	new name.
	* expand/rust-proc-macro.h (RUST_PROC_MACRO_H): Likewise.
	* util/rust-hir-map.h: Likewise.
	* util/rust-token-converter.h: Likewise.
	* util/rust-token-converter.cc: Remove useless include
	directive.
	* Make-lang.in: Rename library.

ChangeLog:

	* libgrust/Makefile.am: Change library name.
	* libgrust/Makefile.in: Likewise.
	* libgrust/configure.ac: Likewise.
	* libgrust/configure: Regenerate.
	* libgrust/libproc_macro/Makefile.am: Moved to...
	* libgrust/libproc_macro_internal/Makefile.am: ...here.
	* libgrust/libproc_macro/Makefile.in: Moved to...
	* libgrust/libproc_macro_internal/Makefile.in: ...here.
	* libgrust/libproc_macro/bridge.h: Moved to...
	* libgrust/libproc_macro_internal/bridge.h: ...here.
	* libgrust/libproc_macro/ffistring.cc: Moved to...
	* libgrust/libproc_macro_internal/ffistring.cc: ...here.
	* libgrust/libproc_macro/ffistring.h: Moved to...
	* libgrust/libproc_macro_internal/ffistring.h: ...here.
	* libgrust/libproc_macro/group.cc: Moved to...
	* libgrust/libproc_macro_internal/group.cc: ...here.
	* libgrust/libproc_macro/group.h: Moved to...
	* libgrust/libproc_macro_internal/group.h: ...here.
	* libgrust/libproc_macro/ident.cc: Moved to...
	* libgrust/libproc_macro_internal/ident.cc: ...here.
	* libgrust/libproc_macro/ident.h: Moved to...
	* libgrust/libproc_macro_internal/ident.h: ...here.
	* libgrust/libproc_macro/literal.cc: Moved to...
	* libgrust/libproc_macro_internal/literal.cc: ...here.
	* libgrust/libproc_macro/literal.h: Moved to...
	* libgrust/libproc_macro_internal/literal.h: ...here.
	* libgrust/libproc_macro/proc_macro.cc: Moved to...
	* libgrust/libproc_macro_internal/proc_macro.cc: ...here.
	* libgrust/libproc_macro/proc_macro.h: Moved to...
	* libgrust/libproc_macro_internal/proc_macro.h: ...here.
	* libgrust/libproc_macro/punct.cc: Moved to...
	* libgrust/libproc_macro_internal/punct.cc: ...here.
	* libgrust/libproc_macro/punct.h: Moved to...
	* libgrust/libproc_macro_internal/punct.h: ...here.
	* libgrust/libproc_macro/registration.h: Moved to...
	* libgrust/libproc_macro_internal/registration.h: ...here.
	* libgrust/libproc_macro/rust/bridge.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/bridge.rs: ...here.
	* libgrust/libproc_macro/rust/bridge/ffistring.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/bridge/ffistring.rs: ...here.
	* libgrust/libproc_macro/rust/bridge/group.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/bridge/group.rs: ...here.
	* libgrust/libproc_macro/rust/bridge/ident.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/bridge/ident.rs: ...here.
	* libgrust/libproc_macro/rust/bridge/literal.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/bridge/literal.rs: ...here.
	* libgrust/libproc_macro/rust/bridge/punct.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/bridge/punct.rs: ...here.
	* libgrust/libproc_macro/rust/bridge/span.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/bridge/span.rs: ...here.
	* libgrust/libproc_macro/rust/bridge/token_stream.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/bridge/token_stream.rs: ...here.
	* libgrust/libproc_macro/rust/group.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/group.rs: ...here.
	* libgrust/libproc_macro/rust/ident.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/ident.rs: ...here.
	* libgrust/libproc_macro/rust/lib.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/lib.rs: ...here.
	* libgrust/libproc_macro/rust/literal.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/literal.rs: ...here.
	* libgrust/libproc_macro/rust/punct.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/punct.rs: ...here.
	* libgrust/libproc_macro/rust/span.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/span.rs: ...here.
	* libgrust/libproc_macro/rust/token_stream.rs: Moved to...
	* libgrust/libproc_macro_internal/rust/token_stream.rs: ...here.
	* libgrust/libproc_macro/span.cc: Moved to...
	* libgrust/libproc_macro_internal/span.cc: ...here.
	* libgrust/libproc_macro/span.h: Moved to...
	* libgrust/libproc_macro_internal/span.h: ...here.
	* libgrust/libproc_macro/tokenstream.cc: Moved to...
	* libgrust/libproc_macro_internal/tokenstream.cc: ...here.
	* libgrust/libproc_macro/tokenstream.h: Moved to...
	* libgrust/libproc_macro_internal/tokenstream.h: ...here.
	* libgrust/libproc_macro/tokentree.cc: Moved to...
	* libgrust/libproc_macro_internal/tokentree.cc: ...here.
	* libgrust/libproc_macro/tokentree.h: Moved to...
	* libgrust/libproc_macro_internal/tokentree.h: ...here.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>

47 files changed, 18 insertions, 19 deletions

diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in
index a4b5e1d..1534046 100644
--- a/gcc/rust/Make-lang.in
+++ b/gcc/rust/Make-lang.in
@@ -195,14 +195,14 @@ RUST_ALL_OBJS = $(GRS_OBJS) $(RUST_TARGET_OBJS)
 
 rust_OBJS = $(RUST_ALL_OBJS) rust/rustspec.o
 
-RUST_LDFLAGS = $(LDFLAGS) -L./../libgrust/libproc_macro
-RUST_LIBDEPS = $(LIBDEPS) ../libgrust/libproc_macro/libproc_macro.a
+RUST_LDFLAGS = $(LDFLAGS) -L./../libgrust/libproc_macro_internal
+RUST_LIBDEPS = $(LIBDEPS) ../libgrust/libproc_macro_internal/libproc_macro_internal.a
 
 # The compiler itself is called crab1
 crab1$(exeext): $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(RUST_LIBDEPS) $(rust.prev)
 	@$(call LINK_PROGRESS,$(INDEX.rust),start)
 	+$(LLINKER) $(ALL_LINKERFLAGS) $(RUST_LDFLAGS) -o $@ \
-	      $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) ../libgrust/libproc_macro/libproc_macro.a $(BACKENDLIBS)
+	      $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) ../libgrust/libproc_macro_internal/libproc_macro_internal.a $(BACKENDLIBS)
 	@$(call LINK_PROGRESS,$(INDEX.rust),end)
 
 # Build hooks.
diff --git a/gcc/rust/expand/rust-macro-expand.h b/gcc/rust/expand/rust-macro-expand.h
index ac6abe4..4e85a3a 100644
--- a/gcc/rust/expand/rust-macro-expand.h
+++ b/gcc/rust/expand/rust-macro-expand.h
@@ -33,7 +33,7 @@
 #include "rust-token-converter.h"
 #include "rust-ast-collector.h"
 #include "rust-system.h"
-#include "libproc_macro/proc_macro.h"
+#include "libproc_macro_internal/proc_macro.h"
 
 // Provides objects and method prototypes for macro expansion
 
diff --git a/gcc/rust/expand/rust-proc-macro.h b/gcc/rust/expand/rust-proc-macro.h
index 7e9d7ec..08d80ee 100644
--- a/gcc/rust/expand/rust-proc-macro.h
+++ b/gcc/rust/expand/rust-proc-macro.h
@@ -17,7 +17,7 @@
 #ifndef RUST_PROC_MACRO_H
 #define RUST_PROC_MACRO_H
 
-#include "libproc_macro/proc_macro.h"
+#include "libproc_macro_internal/proc_macro.h"
 
 namespace Rust {
 /**
diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h
index bf3ed90..f1b334c 100644
--- a/gcc/rust/util/rust-hir-map.h
+++ b/gcc/rust/util/rust-hir-map.h
@@ -28,7 +28,7 @@
 #include "rust-hir-full-decls.h"
 #include "rust-lang-item.h"
 #include "rust-privacy-common.h"
-#include "libproc_macro/proc_macro.h"
+#include "libproc_macro_internal/proc_macro.h"
 
 namespace Rust {
 namespace Analysis {
diff --git a/gcc/rust/util/rust-token-converter.cc b/gcc/rust/util/rust-token-converter.cc
index 67d073d..537bca3 100644
--- a/gcc/rust/util/rust-token-converter.cc
+++ b/gcc/rust/util/rust-token-converter.cc
@@ -16,7 +16,6 @@
 
 #include "rust-lex.h"
 #include "rust-token-converter.h"
-#include "libproc_macro/proc_macro.h"
 #include "bi-map.h"
 #include "line-map.h"
 
diff --git a/gcc/rust/util/rust-token-converter.h b/gcc/rust/util/rust-token-converter.h
index 3e9feeb..0498041 100644
--- a/gcc/rust/util/rust-token-converter.h
+++ b/gcc/rust/util/rust-token-converter.h
@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "rust-token.h"
-#include "libproc_macro/proc_macro.h"
+#include "libproc_macro_internal/proc_macro.h"
 
 namespace Rust {
 
diff --git a/libgrust/Makefile.am b/libgrust/Makefile.am
index 38ee48a..5b38c88 100644
--- a/libgrust/Makefile.am
+++ b/libgrust/Makefile.am
@@ -11,7 +11,7 @@ TOP_GCCDIR := $(shell cd $(top_srcdir) && cd .. && pwd)
 GCC_DIR = $(TOP_GCCDIR)/gcc
 RUST_SRC = $(GCC_DIR)/rust
 
-SUBDIRS = libproc_macro
+SUBDIRS = libproc_macro_internal
 
 RUST_BUILDDIR := $(shell pwd)
 
diff --git a/libgrust/Makefile.in b/libgrust/Makefile.in
index c63f46b..ae9ba91 100644
--- a/libgrust/Makefile.in
+++ b/libgrust/Makefile.in
@@ -303,7 +303,7 @@ AM_CFLAGS = -I $(srcdir)/../libgcc -I $(MULTIBUILDTOP)../../gcc/include
 TOP_GCCDIR := $(shell cd $(top_srcdir) && cd .. && pwd)
 GCC_DIR = $(TOP_GCCDIR)/gcc
 RUST_SRC = $(GCC_DIR)/rust
-SUBDIRS = libproc_macro
+SUBDIRS = libproc_macro_internal
 RUST_BUILDDIR := $(shell pwd)
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
diff --git a/libgrust/configure b/libgrust/configure
index 5346be6..c113876 100755
--- a/libgrust/configure
+++ b/libgrust/configure
@@ -15910,7 +15910,7 @@ esac
 
 
 
-ac_config_files="$ac_config_files libproc_macro/Makefile"
+ac_config_files="$ac_config_files libproc_macro_internal/Makefile"
 
 
 
@@ -17037,7 +17037,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "libproc_macro/Makefile") CONFIG_FILES="$CONFIG_FILES libproc_macro/Makefile" ;;
+    "libproc_macro_internal/Makefile") CONFIG_FILES="$CONFIG_FILES libproc_macro_internal/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -18370,7 +18370,7 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
 _LT_EOF
 
  ;;
-    "libproc_macro/Makefile":F)  cat > vpsed$$ << \_EOF
+    "libproc_macro_internal/Makefile":F)  cat > vpsed$$ << \_EOF
 s!`test -f '$<' || echo '$(srcdir)/'`!!
 _EOF
    sed -f vpsed$$ $ac_file > tmp$$
diff --git a/libgrust/configure.ac b/libgrust/configure.ac
index 7aed489..242ad7f 100644
--- a/libgrust/configure.ac
+++ b/libgrust/configure.ac
@@ -95,7 +95,7 @@ AC_SUBST(toolexecdir)
 AC_SUBST(toolexeclibdir)
 
 
-AC_CONFIG_FILES(AC_FOREACH([DIR], [libproc_macro], [DIR/Makefile ]),
+AC_CONFIG_FILES(AC_FOREACH([DIR], [libproc_macro_internal], [DIR/Makefile ]),
  [ cat > vpsed$$ << \_EOF
 s!`test -f '$<' || echo '$(srcdir)/'`!!
 _EOF
diff --git a/libgrust/libproc_macro/Makefile.am b/libgrust/libproc_macro_internal/Makefile.am
index bae526e..da99610 100644
--- a/libgrust/libproc_macro/Makefile.am
+++ b/libgrust/libproc_macro_internal/Makefile.am
@@ -48,7 +48,7 @@ AM_MAKEFLAGS = \
         "TARGET_LIB_PATH=$(TARGET_LIB_PATH)"
 
 
-TARGETLIB = ./libproc_macro.a
+TARGETLIB = ./libproc_macro_internal.a
 LIBOBJS = @LIBOBJS@
 objext = @OBJEXT@
 
diff --git a/libgrust/libproc_macro/Makefile.in b/libgrust/libproc_macro_internal/Makefile.in
index 55c47d3..0eccade 100644
--- a/libgrust/libproc_macro/Makefile.in
+++ b/libgrust/libproc_macro_internal/Makefile.in
@@ -88,7 +88,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = libproc_macro
+subdir = libproc_macro_internal
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
 	$(top_srcdir)/../config/depstand.m4 \
@@ -303,7 +303,7 @@ AM_MAKEFLAGS = \
 	"WERROR=$(WERROR)" \
         "TARGET_LIB_PATH=$(TARGET_LIB_PATH)"
 
-TARGETLIB = ./libproc_macro.a
+TARGETLIB = ./libproc_macro_internal.a
 objext = @OBJEXT@
 REQUIRED_OFILES = \
 	./proc_macro.$(objext) \
@@ -329,9 +329,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libproc_macro/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libproc_macro_internal/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign libproc_macro/Makefile
+	  $(AUTOMAKE) --foreign libproc_macro_internal/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/libgrust/libproc_macro/bridge.h b/libgrust/libproc_macro_internal/bridge.h
index 47eedff..47eedff 100644
--- a/libgrust/libproc_macro/bridge.h
+++ b/libgrust/libproc_macro_internal/bridge.h
diff --git a/libgrust/libproc_macro/ffistring.cc b/libgrust/libproc_macro_internal/ffistring.cc
index 2de674c..2de674c 100644
--- a/libgrust/libproc_macro/ffistring.cc
+++ b/libgrust/libproc_macro_internal/ffistring.cc
diff --git a/libgrust/libproc_macro/ffistring.h b/libgrust/libproc_macro_internal/ffistring.h
index c151645..c151645 100644
--- a/libgrust/libproc_macro/ffistring.h
+++ b/libgrust/libproc_macro_internal/ffistring.h
diff --git a/libgrust/libproc_macro/group.cc b/libgrust/libproc_macro_internal/group.cc
index 38730d8..38730d8 100644
--- a/libgrust/libproc_macro/group.cc
+++ b/libgrust/libproc_macro_internal/group.cc
diff --git a/libgrust/libproc_macro/group.h b/libgrust/libproc_macro_internal/group.h
index fa76d4b..fa76d4b 100644
--- a/libgrust/libproc_macro/group.h
+++ b/libgrust/libproc_macro_internal/group.h
diff --git a/libgrust/libproc_macro/ident.cc b/libgrust/libproc_macro_internal/ident.cc
index 221d38e..221d38e 100644
--- a/libgrust/libproc_macro/ident.cc
+++ b/libgrust/libproc_macro_internal/ident.cc
diff --git a/libgrust/libproc_macro/ident.h b/libgrust/libproc_macro_internal/ident.h
index 66547d9..66547d9 100644
--- a/libgrust/libproc_macro/ident.h
+++ b/libgrust/libproc_macro_internal/ident.h
diff --git a/libgrust/libproc_macro/literal.cc b/libgrust/libproc_macro_internal/literal.cc
index ea09106..ea09106 100644
--- a/libgrust/libproc_macro/literal.cc
+++ b/libgrust/libproc_macro_internal/literal.cc
diff --git a/libgrust/libproc_macro/literal.h b/libgrust/libproc_macro_internal/literal.h
index 37ba089..37ba089 100644
--- a/libgrust/libproc_macro/literal.h
+++ b/libgrust/libproc_macro_internal/literal.h
diff --git a/libgrust/libproc_macro/proc_macro.cc b/libgrust/libproc_macro_internal/proc_macro.cc
index 0490673..0490673 100644
--- a/libgrust/libproc_macro/proc_macro.cc
+++ b/libgrust/libproc_macro_internal/proc_macro.cc
diff --git a/libgrust/libproc_macro/proc_macro.h b/libgrust/libproc_macro_internal/proc_macro.h
index 457ec46..457ec46 100644
--- a/libgrust/libproc_macro/proc_macro.h
+++ b/libgrust/libproc_macro_internal/proc_macro.h
diff --git a/libgrust/libproc_macro/punct.cc b/libgrust/libproc_macro_internal/punct.cc
index 32450cc..32450cc 100644
--- a/libgrust/libproc_macro/punct.cc
+++ b/libgrust/libproc_macro_internal/punct.cc
diff --git a/libgrust/libproc_macro/punct.h b/libgrust/libproc_macro_internal/punct.h
index 6d01460..6d01460 100644
--- a/libgrust/libproc_macro/punct.h
+++ b/libgrust/libproc_macro_internal/punct.h
diff --git a/libgrust/libproc_macro/registration.h b/libgrust/libproc_macro_internal/registration.h
index 98e7c13..98e7c13 100644
--- a/libgrust/libproc_macro/registration.h
+++ b/libgrust/libproc_macro_internal/registration.h
diff --git a/libgrust/libproc_macro/rust/bridge.rs b/libgrust/libproc_macro_internal/rust/bridge.rs
index 3900ae1..3900ae1 100644
--- a/libgrust/libproc_macro/rust/bridge.rs
+++ b/libgrust/libproc_macro_internal/rust/bridge.rs
diff --git a/libgrust/libproc_macro/rust/bridge/ffistring.rs b/libgrust/libproc_macro_internal/rust/bridge/ffistring.rs
index 73162e9..73162e9 100644
--- a/libgrust/libproc_macro/rust/bridge/ffistring.rs
+++ b/libgrust/libproc_macro_internal/rust/bridge/ffistring.rs
diff --git a/libgrust/libproc_macro/rust/bridge/group.rs b/libgrust/libproc_macro_internal/rust/bridge/group.rs
index 254a3db..254a3db 100644
--- a/libgrust/libproc_macro/rust/bridge/group.rs
+++ b/libgrust/libproc_macro_internal/rust/bridge/group.rs
diff --git a/libgrust/libproc_macro/rust/bridge/ident.rs b/libgrust/libproc_macro_internal/rust/bridge/ident.rs
index d58896d..d58896d 100644
--- a/libgrust/libproc_macro/rust/bridge/ident.rs
+++ b/libgrust/libproc_macro_internal/rust/bridge/ident.rs
diff --git a/libgrust/libproc_macro/rust/bridge/literal.rs b/libgrust/libproc_macro_internal/rust/bridge/literal.rs
index 5982504..5982504 100644
--- a/libgrust/libproc_macro/rust/bridge/literal.rs
+++ b/libgrust/libproc_macro_internal/rust/bridge/literal.rs
diff --git a/libgrust/libproc_macro/rust/bridge/punct.rs b/libgrust/libproc_macro_internal/rust/bridge/punct.rs
index e835472..e835472 100644
--- a/libgrust/libproc_macro/rust/bridge/punct.rs
+++ b/libgrust/libproc_macro_internal/rust/bridge/punct.rs
diff --git a/libgrust/libproc_macro/rust/bridge/span.rs b/libgrust/libproc_macro_internal/rust/bridge/span.rs
index 06537c9..06537c9 100644
--- a/libgrust/libproc_macro/rust/bridge/span.rs
+++ b/libgrust/libproc_macro_internal/rust/bridge/span.rs
diff --git a/libgrust/libproc_macro/rust/bridge/token_stream.rs b/libgrust/libproc_macro_internal/rust/bridge/token_stream.rs
index 094f91f..094f91f 100644
--- a/libgrust/libproc_macro/rust/bridge/token_stream.rs
+++ b/libgrust/libproc_macro_internal/rust/bridge/token_stream.rs
diff --git a/libgrust/libproc_macro/rust/group.rs b/libgrust/libproc_macro_internal/rust/group.rs
index 29bfb9d..29bfb9d 100644
--- a/libgrust/libproc_macro/rust/group.rs
+++ b/libgrust/libproc_macro_internal/rust/group.rs
diff --git a/libgrust/libproc_macro/rust/ident.rs b/libgrust/libproc_macro_internal/rust/ident.rs
index 809c993..809c993 100644
--- a/libgrust/libproc_macro/rust/ident.rs
+++ b/libgrust/libproc_macro_internal/rust/ident.rs
diff --git a/libgrust/libproc_macro/rust/lib.rs b/libgrust/libproc_macro_internal/rust/lib.rs
index a1be0ac..a1be0ac 100644
--- a/libgrust/libproc_macro/rust/lib.rs
+++ b/libgrust/libproc_macro_internal/rust/lib.rs
diff --git a/libgrust/libproc_macro/rust/literal.rs b/libgrust/libproc_macro_internal/rust/literal.rs
index 171ca56..171ca56 100644
--- a/libgrust/libproc_macro/rust/literal.rs
+++ b/libgrust/libproc_macro_internal/rust/literal.rs
diff --git a/libgrust/libproc_macro/rust/punct.rs b/libgrust/libproc_macro_internal/rust/punct.rs
index 0f7830e..0f7830e 100644
--- a/libgrust/libproc_macro/rust/punct.rs
+++ b/libgrust/libproc_macro_internal/rust/punct.rs
diff --git a/libgrust/libproc_macro/rust/span.rs b/libgrust/libproc_macro_internal/rust/span.rs
index b5d573c..b5d573c 100644
--- a/libgrust/libproc_macro/rust/span.rs
+++ b/libgrust/libproc_macro_internal/rust/span.rs
diff --git a/libgrust/libproc_macro/rust/token_stream.rs b/libgrust/libproc_macro_internal/rust/token_stream.rs
index 9333e3e..9333e3e 100644
--- a/libgrust/libproc_macro/rust/token_stream.rs
+++ b/libgrust/libproc_macro_internal/rust/token_stream.rs
diff --git a/libgrust/libproc_macro/span.cc b/libgrust/libproc_macro_internal/span.cc
index 62c8c57..62c8c57 100644
--- a/libgrust/libproc_macro/span.cc
+++ b/libgrust/libproc_macro_internal/span.cc
diff --git a/libgrust/libproc_macro/span.h b/libgrust/libproc_macro_internal/span.h
index 70ea9e7..70ea9e7 100644
--- a/libgrust/libproc_macro/span.h
+++ b/libgrust/libproc_macro_internal/span.h
diff --git a/libgrust/libproc_macro/tokenstream.cc b/libgrust/libproc_macro_internal/tokenstream.cc
index 685f284..685f284 100644
--- a/libgrust/libproc_macro/tokenstream.cc
+++ b/libgrust/libproc_macro_internal/tokenstream.cc
diff --git a/libgrust/libproc_macro/tokenstream.h b/libgrust/libproc_macro_internal/tokenstream.h
index 0fde5ea..0fde5ea 100644
--- a/libgrust/libproc_macro/tokenstream.h
+++ b/libgrust/libproc_macro_internal/tokenstream.h
diff --git a/libgrust/libproc_macro/tokentree.cc b/libgrust/libproc_macro_internal/tokentree.cc
index b034a8c..b034a8c 100644
--- a/libgrust/libproc_macro/tokentree.cc
+++ b/libgrust/libproc_macro_internal/tokentree.cc
diff --git a/libgrust/libproc_macro/tokentree.h b/libgrust/libproc_macro_internal/tokentree.h
index 1a50ecf..1a50ecf 100644
--- a/libgrust/libproc_macro/tokentree.h
+++ b/libgrust/libproc_macro_internal/tokentree.h