[latex3-commits] [git/LaTeX3-latex3-latex3] debug: Use \file_input:n for loading deprecation code (feea26015)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : debug
Link       : https://github.com/latex3/latex3/commit/feea26015edee896e54fd2f2941f7c82dfb946a9

>---------------------------------------------------------------

commit feea26015edee896e54fd2f2941f7c82dfb946a9
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Sep 18 08:57:45 2019 +0100

    Use \file_input:n for loading deprecation code
    
    This way it shows up in the file log.


>---------------------------------------------------------------

feea26015edee896e54fd2f2941f7c82dfb946a9
 l3kernel/l3deprecation.dtx              | 2 +-
 l3kernel/testfiles/m3expl002.luatex.tlg | 9 ++++-----
 l3kernel/testfiles/m3expl002.ptex.tlg   | 9 ++++-----
 l3kernel/testfiles/m3expl002.tlg        | 9 ++++-----
 l3kernel/testfiles/m3expl002.uptex.tlg  | 9 ++++-----
 l3kernel/testfiles/m3expl002.xetex.tlg  | 8 +++-----
 l3kernel/testfiles/m3file001.luatex.tlg | 4 ++--
 l3kernel/testfiles/m3file001.ptex.tlg   | 4 ++--
 l3kernel/testfiles/m3file001.tlg        | 4 ++--
 l3kernel/testfiles/m3file001.uptex.tlg  | 4 ++--
 l3kernel/testfiles/m3file001.xetex.tlg  | 4 ++--
 11 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/l3kernel/l3deprecation.dtx b/l3kernel/l3deprecation.dtx
index e351512e4..c5dd76bfd 100644
--- a/l3kernel/l3deprecation.dtx
+++ b/l3kernel/l3deprecation.dtx
@@ -543,7 +543,7 @@
       { \exp_not:N \ProvidesFile {#1} [ #2~v#3~#4 ] }
       { \iow_log:x { File:~#1~#2~v#3~#4 } }
   }
-\tex_input:D l3deprecation.def \scan_stop:
+\file_input:n { l3deprecation.def }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
diff --git a/l3kernel/testfiles/m3expl002.luatex.tlg b/l3kernel/testfiles/m3expl002.luatex.tlg
index 4b3d9b512..947a3f9ae 100644
--- a/l3kernel/testfiles/m3expl002.luatex.tlg
+++ b/l3kernel/testfiles/m3expl002.luatex.tlg
@@ -154,12 +154,11 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 (l3deprecation.def
 File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 \c__deprecation_minus_one=\count...
-)) (l3backend-pdfmode.def
+)) (l3debug.def
+File: l3debug.def ....-..-.. v L3 Debugging support
+)
+(l3backend-pdfmode.def
 File: l3backend-pdfmode.def ....-..-.. v L3 Experimental backend support: PDF mode
 \l__kernel_color_stack_int=\count...
 \l__pdf_internal_box=\box...
-) (l3debug.def
-File: l3debug.def ....-..-.. v L3 Debugging support
-) (l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 ))
diff --git a/l3kernel/testfiles/m3expl002.ptex.tlg b/l3kernel/testfiles/m3expl002.ptex.tlg
index d96cd5f15..414e44dbb 100644
--- a/l3kernel/testfiles/m3expl002.ptex.tlg
+++ b/l3kernel/testfiles/m3expl002.ptex.tlg
@@ -157,14 +157,13 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 (l3deprecation.def
 File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 \c__deprecation_minus_one=\count...
-)) (l3backend-dvipdfmx.def
+)) (l3debug.def
+File: l3debug.def ....-..-.. v L3 Debugging support
+)
+(l3backend-dvipdfmx.def
 File: l3backend-dvipdfmx.def ....-..-.. v L3 Experimental backend support: dvipdfmx
 \g__graphics_track_int=\count...
 \l__pdf_internal_box=\box...
 \g__pdf_backend_object_int=\count...
 \g__pdf_backend_annotation_int=\count...
-) (l3debug.def
-File: l3debug.def ....-..-.. v L3 Debugging support
-) (l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 ))
diff --git a/l3kernel/testfiles/m3expl002.tlg b/l3kernel/testfiles/m3expl002.tlg
index 701542460..f58c29d74 100644
--- a/l3kernel/testfiles/m3expl002.tlg
+++ b/l3kernel/testfiles/m3expl002.tlg
@@ -157,12 +157,11 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 (l3deprecation.def
 File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 \c__deprecation_minus_one=\count...
-)) (l3backend-pdfmode.def
+)) (l3debug.def
+File: l3debug.def ....-..-.. v L3 Debugging support
+)
+(l3backend-pdfmode.def
 File: l3backend-pdfmode.def ....-..-.. v L3 Experimental backend support: PDF mode
 \l__kernel_color_stack_int=\count...
 \l__pdf_internal_box=\box...
-) (l3debug.def
-File: l3debug.def ....-..-.. v L3 Debugging support
-) (l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 ))
diff --git a/l3kernel/testfiles/m3expl002.uptex.tlg b/l3kernel/testfiles/m3expl002.uptex.tlg
index c2e2ba544..4a3d6384b 100644
--- a/l3kernel/testfiles/m3expl002.uptex.tlg
+++ b/l3kernel/testfiles/m3expl002.uptex.tlg
@@ -153,14 +153,13 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 (l3deprecation.def
 File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 \c__deprecation_minus_one=\count...
-)) (l3backend-dvipdfmx.def
+)) (l3debug.def
+File: l3debug.def ....-..-.. v L3 Debugging support
+)
+(l3backend-dvipdfmx.def
 File: l3backend-dvipdfmx.def ....-..-.. v L3 Experimental backend support: dvipdfmx
 \g__graphics_track_int=\count...
 \l__pdf_internal_box=\box...
 \g__pdf_backend_object_int=\count...
 \g__pdf_backend_annotation_int=\count...
-) (l3debug.def
-File: l3debug.def ....-..-.. v L3 Debugging support
-) (l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 ))
diff --git a/l3kernel/testfiles/m3expl002.xetex.tlg b/l3kernel/testfiles/m3expl002.xetex.tlg
index 11f296cf6..e80a6d4af 100644
--- a/l3kernel/testfiles/m3expl002.xetex.tlg
+++ b/l3kernel/testfiles/m3expl002.xetex.tlg
@@ -153,15 +153,13 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 (l3deprecation.def
 File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 \c__deprecation_minus_one=\count...
-))
+)) (l3debug.def
+File: l3debug.def ....-..-.. v L3 Debugging support
+)
 (l3backend-xdvipdfmx.def
 File: l3backend-xdvipdfmx.def ....-..-.. v L3 Experimental backend support: xdvipdfmx
 \g__graphics_track_int=\count...
 \l__pdf_internal_box=\box...
 \g__pdf_backend_object_int=\count...
 \g__pdf_backend_annotation_int=\count...
-) (l3debug.def
-File: l3debug.def ....-..-.. v L3 Debugging support
-) (l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 ))
diff --git a/l3kernel/testfiles/m3file001.luatex.tlg b/l3kernel/testfiles/m3file001.luatex.tlg
index 7449573a4..61fcf12c1 100644
--- a/l3kernel/testfiles/m3file001.luatex.tlg
+++ b/l3kernel/testfiles/m3file001.luatex.tlg
@@ -160,9 +160,9 @@ fontenc.sty
 ot1enc.def
 expl3.sty
 expl3-code.tex
-l3backend-pdfmode.def
-l3debug.def
 l3deprecation.def
+l3debug.def
+l3backend-pdfmode.def
 filetest.txt
 filetest-endinput.txt
 .............
diff --git a/l3kernel/testfiles/m3file001.ptex.tlg b/l3kernel/testfiles/m3file001.ptex.tlg
index 77164c980..11579fcd3 100644
--- a/l3kernel/testfiles/m3file001.ptex.tlg
+++ b/l3kernel/testfiles/m3file001.ptex.tlg
@@ -161,9 +161,9 @@ fontenc.sty
 ot1enc.def
 expl3.sty
 expl3-code.tex
-l3backend-dvipdfmx.def
-l3debug.def
 l3deprecation.def
+l3debug.def
+l3backend-dvipdfmx.def
 filetest.txt
 filetest-endinput.txt
 .............
diff --git a/l3kernel/testfiles/m3file001.tlg b/l3kernel/testfiles/m3file001.tlg
index 5603b0c37..557cadab3 100644
--- a/l3kernel/testfiles/m3file001.tlg
+++ b/l3kernel/testfiles/m3file001.tlg
@@ -155,9 +155,9 @@ fontenc.sty
 ot1enc.def
 expl3.sty
 expl3-code.tex
-l3backend-pdfmode.def
-l3debug.def
 l3deprecation.def
+l3debug.def
+l3backend-pdfmode.def
 filetest.txt
 filetest-endinput.txt
 .............
diff --git a/l3kernel/testfiles/m3file001.uptex.tlg b/l3kernel/testfiles/m3file001.uptex.tlg
index d71a28a66..e2fcd530a 100644
--- a/l3kernel/testfiles/m3file001.uptex.tlg
+++ b/l3kernel/testfiles/m3file001.uptex.tlg
@@ -161,9 +161,9 @@ fontenc.sty
 ot1enc.def
 expl3.sty
 expl3-code.tex
-l3backend-dvipdfmx.def
-l3debug.def
 l3deprecation.def
+l3debug.def
+l3backend-dvipdfmx.def
 filetest.txt
 filetest-endinput.txt
 .............
diff --git a/l3kernel/testfiles/m3file001.xetex.tlg b/l3kernel/testfiles/m3file001.xetex.tlg
index bcf6f9832..baca7f6b8 100644
--- a/l3kernel/testfiles/m3file001.xetex.tlg
+++ b/l3kernel/testfiles/m3file001.xetex.tlg
@@ -155,9 +155,9 @@ fontenc.sty
 ot1enc.def
 expl3.sty
 expl3-code.tex
-l3backend-xdvipdfmx.def
-l3debug.def
 l3deprecation.def
+l3debug.def
+l3backend-xdvipdfmx.def
 filetest.txt
 filetest-endinput.txt
 .............