aboutsummaryrefslogtreecommitdiff
path: root/libgrust
diff options
context:
space:
mode:
authorPierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>2023-08-28 17:08:40 +0200
committerArthur Cohen <arthur.cohen@embecosm.com>2024-01-16 19:04:31 +0100
commitfd73cf8c31611dd8ddbf7835ce246e56771618ef (patch)
tree038cfa15ed3b7589ecf1c563ecc00b5d4a836923 /libgrust
parentb7809f89fb89aa0bef43790c9140cfd4aa8da02f (diff)
downloadgcc-fd73cf8c31611dd8ddbf7835ce246e56771618ef.zip
gcc-fd73cf8c31611dd8ddbf7835ce246e56771618ef.tar.gz
gcc-fd73cf8c31611dd8ddbf7835ce246e56771618ef.tar.bz2
gccrs: 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. libgrust/ChangeLog: * Makefile.am: Change library name. * Makefile.in: Likewise. * configure.ac: Likewise. * configure: Regenerate. * libproc_macro/Makefile.am: Moved to... * libproc_macro_internal/Makefile.am: ...here. * libproc_macro/Makefile.in: Moved to... * libproc_macro_internal/Makefile.in: ...here. * libproc_macro/bridge.h: Moved to... * libproc_macro_internal/bridge.h: ...here. * libproc_macro/ffistring.cc: Moved to... * libproc_macro_internal/ffistring.cc: ...here. * libproc_macro/ffistring.h: Moved to... * libproc_macro_internal/ffistring.h: ...here. * libproc_macro/group.cc: Moved to... * libproc_macro_internal/group.cc: ...here. * libproc_macro/group.h: Moved to... * libproc_macro_internal/group.h: ...here. * libproc_macro/ident.cc: Moved to... * libproc_macro_internal/ident.cc: ...here. * libproc_macro/ident.h: Moved to... * libproc_macro_internal/ident.h: ...here. * libproc_macro/literal.cc: Moved to... * libproc_macro_internal/literal.cc: ...here. * libproc_macro/literal.h: Moved to... * libproc_macro_internal/literal.h: ...here. * libproc_macro/proc_macro.cc: Moved to... * libproc_macro_internal/proc_macro.cc: ...here. * libproc_macro/proc_macro.h: Moved to... * libproc_macro_internal/proc_macro.h: ...here. * libproc_macro/punct.cc: Moved to... * libproc_macro_internal/punct.cc: ...here. * libproc_macro/punct.h: Moved to... * libproc_macro_internal/punct.h: ...here. * libproc_macro/registration.h: Moved to... * libproc_macro_internal/registration.h: ...here. * libproc_macro/rust/bridge.rs: Moved to... * libproc_macro_internal/rust/bridge.rs: ...here. * libproc_macro/rust/bridge/ffistring.rs: Moved to... * libproc_macro_internal/rust/bridge/ffistring.rs: ...here. * libproc_macro/rust/bridge/group.rs: Moved to... * libproc_macro_internal/rust/bridge/group.rs: ...here. * libproc_macro/rust/bridge/ident.rs: Moved to... * libproc_macro_internal/rust/bridge/ident.rs: ...here. * libproc_macro/rust/bridge/literal.rs: Moved to... * libproc_macro_internal/rust/bridge/literal.rs: ...here. * libproc_macro/rust/bridge/punct.rs: Moved to... * libproc_macro_internal/rust/bridge/punct.rs: ...here. * libproc_macro/rust/bridge/span.rs: Moved to... * libproc_macro_internal/rust/bridge/span.rs: ...here. * libproc_macro/rust/bridge/token_stream.rs: Moved to... * libproc_macro_internal/rust/bridge/token_stream.rs: ...here. * libproc_macro/rust/group.rs: Moved to... * libproc_macro_internal/rust/group.rs: ...here. * libproc_macro/rust/ident.rs: Moved to... * libproc_macro_internal/rust/ident.rs: ...here. * libproc_macro/rust/lib.rs: Moved to... * libproc_macro_internal/rust/lib.rs: ...here. * libproc_macro/rust/literal.rs: Moved to... * libproc_macro_internal/rust/literal.rs: ...here. * libproc_macro/rust/punct.rs: Moved to... * libproc_macro_internal/rust/punct.rs: ...here. * libproc_macro/rust/span.rs: Moved to... * libproc_macro_internal/rust/span.rs: ...here. * libproc_macro/rust/token_stream.rs: Moved to... * libproc_macro_internal/rust/token_stream.rs: ...here. * libproc_macro/span.cc: Moved to... * libproc_macro_internal/span.cc: ...here. * libproc_macro/span.h: Moved to... * libproc_macro_internal/span.h: ...here. * libproc_macro/tokenstream.cc: Moved to... * libproc_macro_internal/tokenstream.cc: ...here. * libproc_macro/tokenstream.h: Moved to... * libproc_macro_internal/tokenstream.h: ...here. * libproc_macro/tokentree.cc: Moved to... * libproc_macro_internal/tokentree.cc: ...here. * libproc_macro/tokentree.h: Moved to... * libproc_macro_internal/tokentree.h: ...here. Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Diffstat (limited to 'libgrust')
-rw-r--r--libgrust/Makefile.am2
-rw-r--r--libgrust/Makefile.in2
-rwxr-xr-xlibgrust/configure6
-rw-r--r--libgrust/configure.ac2
-rw-r--r--libgrust/libproc_macro_internal/Makefile.am (renamed from libgrust/libproc_macro/Makefile.am)3
-rw-r--r--libgrust/libproc_macro_internal/Makefile.in (renamed from libgrust/libproc_macro/Makefile.in)8
-rw-r--r--libgrust/libproc_macro_internal/bridge.h (renamed from libgrust/libproc_macro/bridge.h)0
-rw-r--r--libgrust/libproc_macro_internal/ffistring.cc (renamed from libgrust/libproc_macro/ffistring.cc)0
-rw-r--r--libgrust/libproc_macro_internal/ffistring.h (renamed from libgrust/libproc_macro/ffistring.h)0
-rw-r--r--libgrust/libproc_macro_internal/group.cc (renamed from libgrust/libproc_macro/group.cc)0
-rw-r--r--libgrust/libproc_macro_internal/group.h (renamed from libgrust/libproc_macro/group.h)0
-rw-r--r--libgrust/libproc_macro_internal/ident.cc (renamed from libgrust/libproc_macro/ident.cc)0
-rw-r--r--libgrust/libproc_macro_internal/ident.h (renamed from libgrust/libproc_macro/ident.h)0
-rw-r--r--libgrust/libproc_macro_internal/literal.cc (renamed from libgrust/libproc_macro/literal.cc)0
-rw-r--r--libgrust/libproc_macro_internal/literal.h (renamed from libgrust/libproc_macro/literal.h)0
-rw-r--r--libgrust/libproc_macro_internal/proc_macro.cc (renamed from libgrust/libproc_macro/proc_macro.cc)0
-rw-r--r--libgrust/libproc_macro_internal/proc_macro.h (renamed from libgrust/libproc_macro/proc_macro.h)0
-rw-r--r--libgrust/libproc_macro_internal/punct.cc (renamed from libgrust/libproc_macro/punct.cc)0
-rw-r--r--libgrust/libproc_macro_internal/punct.h (renamed from libgrust/libproc_macro/punct.h)0
-rw-r--r--libgrust/libproc_macro_internal/registration.h (renamed from libgrust/libproc_macro/registration.h)0
-rw-r--r--libgrust/libproc_macro_internal/rust/bridge.rs (renamed from libgrust/libproc_macro/rust/bridge.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/bridge/ffistring.rs (renamed from libgrust/libproc_macro/rust/bridge/ffistring.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/bridge/group.rs (renamed from libgrust/libproc_macro/rust/bridge/group.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/bridge/ident.rs (renamed from libgrust/libproc_macro/rust/bridge/ident.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/bridge/literal.rs (renamed from libgrust/libproc_macro/rust/bridge/literal.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/bridge/punct.rs (renamed from libgrust/libproc_macro/rust/bridge/punct.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/bridge/span.rs (renamed from libgrust/libproc_macro/rust/bridge/span.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/bridge/token_stream.rs (renamed from libgrust/libproc_macro/rust/bridge/token_stream.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/group.rs (renamed from libgrust/libproc_macro/rust/group.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/ident.rs (renamed from libgrust/libproc_macro/rust/ident.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/lib.rs (renamed from libgrust/libproc_macro/rust/lib.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/literal.rs (renamed from libgrust/libproc_macro/rust/literal.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/punct.rs (renamed from libgrust/libproc_macro/rust/punct.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/span.rs (renamed from libgrust/libproc_macro/rust/span.rs)0
-rw-r--r--libgrust/libproc_macro_internal/rust/token_stream.rs (renamed from libgrust/libproc_macro/rust/token_stream.rs)0
-rw-r--r--libgrust/libproc_macro_internal/span.cc (renamed from libgrust/libproc_macro/span.cc)0
-rw-r--r--libgrust/libproc_macro_internal/span.h (renamed from libgrust/libproc_macro/span.h)0
-rw-r--r--libgrust/libproc_macro_internal/tokenstream.cc (renamed from libgrust/libproc_macro/tokenstream.cc)0
-rw-r--r--libgrust/libproc_macro_internal/tokenstream.h (renamed from libgrust/libproc_macro/tokenstream.h)0
-rw-r--r--libgrust/libproc_macro_internal/tokentree.cc (renamed from libgrust/libproc_macro/tokentree.cc)0
-rw-r--r--libgrust/libproc_macro_internal/tokentree.h (renamed from libgrust/libproc_macro/tokentree.h)0
41 files changed, 12 insertions, 11 deletions
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 e9a410b..d065584 100644
--- a/libgrust/Makefile.in
+++ b/libgrust/Makefile.in
@@ -308,7 +308,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 e778a25..dcdc314 100755
--- a/libgrust/configure
+++ b/libgrust/configure
@@ -16193,7 +16193,7 @@ esac
-ac_config_files="$ac_config_files libproc_macro/Makefile"
+ac_config_files="$ac_config_files libproc_macro_internal/Makefile"
@@ -17348,7 +17348,7 @@ do
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"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
@@ -18689,7 +18689,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 adfb350..d55e698 100644
--- a/libgrust/configure.ac
+++ b/libgrust/configure.ac
@@ -104,7 +104,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 24945a4..da99610 100644
--- a/libgrust/libproc_macro/Makefile.am
+++ b/libgrust/libproc_macro_internal/Makefile.am
@@ -47,7 +47,8 @@ AM_MAKEFLAGS = \
"WERROR=$(WERROR)" \
"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 db5f2d4..68aa461 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/cet.m4 \
@@ -308,7 +308,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) \
@@ -334,9 +334,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