[niepce/lr-import: 2/20] rust: Use the new standard for modules




commit b64da7f5fe70f6c264c14a095e36ad9070d4f4be
Author: Hubert Figuière <hub figuiere net>
Date:   Fri Jul 16 22:54:53 2021 -0400

    rust: Use the new standard for modules

 crates/npc-engine/src/{db/mod.rs => db.rs}         |  0
 .../npc-engine/src/{library/mod.rs => library.rs}  |  0
 crates/npc-fwk/src/{base/mod.rs => base.rs}        |  0
 crates/npc-fwk/src/{toolkit/mod.rs => toolkit.rs}  |  0
 .../src/toolkit/{widgets/mod.rs => widgets.rs}     |  0
 crates/npc-fwk/src/{utils/mod.rs => utils.rs}      |  0
 .../src/{libraryclient/mod.rs => libraryclient.rs} |  0
 niepce-main/src/{niepce/mod.rs => niepce.rs}       |  0
 niepce-main/src/niepce/{ui/mod.rs => ui.rs}        |  0
 .../src/niepce/ui/{dialogs/mod.rs => dialogs.rs}   |  0
 src/Makefile.am                                    | 22 +++++++++++-----------
 11 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/crates/npc-engine/src/db/mod.rs b/crates/npc-engine/src/db.rs
similarity index 100%
rename from crates/npc-engine/src/db/mod.rs
rename to crates/npc-engine/src/db.rs
diff --git a/crates/npc-engine/src/library/mod.rs b/crates/npc-engine/src/library.rs
similarity index 100%
rename from crates/npc-engine/src/library/mod.rs
rename to crates/npc-engine/src/library.rs
diff --git a/crates/npc-fwk/src/base/mod.rs b/crates/npc-fwk/src/base.rs
similarity index 100%
rename from crates/npc-fwk/src/base/mod.rs
rename to crates/npc-fwk/src/base.rs
diff --git a/crates/npc-fwk/src/toolkit/mod.rs b/crates/npc-fwk/src/toolkit.rs
similarity index 100%
rename from crates/npc-fwk/src/toolkit/mod.rs
rename to crates/npc-fwk/src/toolkit.rs
diff --git a/crates/npc-fwk/src/toolkit/widgets/mod.rs b/crates/npc-fwk/src/toolkit/widgets.rs
similarity index 100%
rename from crates/npc-fwk/src/toolkit/widgets/mod.rs
rename to crates/npc-fwk/src/toolkit/widgets.rs
diff --git a/crates/npc-fwk/src/utils/mod.rs b/crates/npc-fwk/src/utils.rs
similarity index 100%
rename from crates/npc-fwk/src/utils/mod.rs
rename to crates/npc-fwk/src/utils.rs
diff --git a/niepce-main/src/libraryclient/mod.rs b/niepce-main/src/libraryclient.rs
similarity index 100%
rename from niepce-main/src/libraryclient/mod.rs
rename to niepce-main/src/libraryclient.rs
diff --git a/niepce-main/src/niepce/mod.rs b/niepce-main/src/niepce.rs
similarity index 100%
rename from niepce-main/src/niepce/mod.rs
rename to niepce-main/src/niepce.rs
diff --git a/niepce-main/src/niepce/ui/mod.rs b/niepce-main/src/niepce/ui.rs
similarity index 100%
rename from niepce-main/src/niepce/ui/mod.rs
rename to niepce-main/src/niepce/ui.rs
diff --git a/niepce-main/src/niepce/ui/dialogs/mod.rs b/niepce-main/src/niepce/ui/dialogs.rs
similarity index 100%
rename from niepce-main/src/niepce/ui/dialogs/mod.rs
rename to niepce-main/src/niepce/ui/dialogs.rs
diff --git a/src/Makefile.am b/src/Makefile.am
index 311425f..6238fbe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,7 @@ RUST_SOURCES = \
        @top_srcdir@/Cargo.lock \
        @top_srcdir@/crates/npc-engine/Cargo.toml \
        @top_srcdir@/crates/npc-engine/build.rs \
+       @top_srcdir@/crates/npc-engine/src/db.rs \
        @top_srcdir@/crates/npc-engine/src/db/filebundle.rs \
        @top_srcdir@/crates/npc-engine/src/db/fsfile.rs \
        @top_srcdir@/crates/npc-engine/src/db/keyword.rs \
@@ -17,49 +18,48 @@ RUST_SOURCES = \
        @top_srcdir@/crates/npc-engine/src/db/libfolder.rs \
        @top_srcdir@/crates/npc-engine/src/db/libmetadata.rs \
        @top_srcdir@/crates/npc-engine/src/db/library.rs \
-       @top_srcdir@/crates/npc-engine/src/db/mod.rs \
        @top_srcdir@/crates/npc-engine/src/db/props.rs \
+       @top_srcdir@/crates/npc-engine/src/library.rs \
        @top_srcdir@/crates/npc-engine/src/library/commands.rs \
-       @top_srcdir@/crates/npc-engine/src/library/mod.rs \
        @top_srcdir@/crates/npc-engine/src/library/notification.rs \
-       @top_srcdir@/crates/npc-engine/src/library/queriedcontent.rs \
        @top_srcdir@/crates/npc-engine/src/library/op.rs \
+       @top_srcdir@/crates/npc-engine/src/library/queriedcontent.rs \
        @top_srcdir@/crates/npc-engine/src/library/thumbnail_cache.rs \
        @top_srcdir@/crates/npc-engine/src/lib.rs \
        @top_srcdir@/crates/npc-fwk/Cargo.toml \
        @top_srcdir@/crates/npc-fwk/build.rs \
        @top_srcdir@/crates/npc-fwk/src/capi.rs \
+       @top_srcdir@/crates/npc-fwk/src/base.rs \
        @top_srcdir@/crates/npc-fwk/src/base/date.rs \
        @top_srcdir@/crates/npc-fwk/src/base/debug.rs \
        @top_srcdir@/crates/npc-fwk/src/base/fractions.rs \
-       @top_srcdir@/crates/npc-fwk/src/base/mod.rs \
        @top_srcdir@/crates/npc-fwk/src/base/propertybag.rs \
        @top_srcdir@/crates/npc-fwk/src/base/propertyvalue.rs \
        @top_srcdir@/crates/npc-fwk/src/base/rgbcolour.rs \
        @top_srcdir@/crates/npc-fwk/src/lib.rs \
+       @top_srcdir@/crates/npc-fwk/src/toolkit.rs \
        @top_srcdir@/crates/npc-fwk/src/toolkit/gdk_utils.rs \
        @top_srcdir@/crates/npc-fwk/src/toolkit/mimetype.rs \
-       @top_srcdir@/crates/npc-fwk/src/toolkit/mod.rs \
        @top_srcdir@/crates/npc-fwk/src/toolkit/thumbnail.rs \
-       @top_srcdir@/crates/npc-fwk/src/toolkit/widgets/mod.rs \
+       @top_srcdir@/crates/npc-fwk/src/toolkit/widgets.rs \
        @top_srcdir@/crates/npc-fwk/src/toolkit/widgets/rating_label.rs \
+       @top_srcdir@/crates/npc-fwk/src/utils.rs \
        @top_srcdir@/crates/npc-fwk/src/utils/exempi.rs \
        @top_srcdir@/crates/npc-fwk/src/utils/exiv2.rs \
        @top_srcdir@/crates/npc-fwk/src/utils/files.rs \
-       @top_srcdir@/crates/npc-fwk/src/utils/mod.rs \
        @top_srcdir@/niepce-main/build.rs \
        @top_srcdir@/niepce-main/Cargo.toml \
        @top_srcdir@/niepce-main/examples/widget-test.rs \
        @top_srcdir@/niepce-main/src/lib.rs \
+       @top_srcdir@/niepce-main/src/libraryclient.rs \
        @top_srcdir@/niepce-main/src/libraryclient/clientimpl.rs \
        @top_srcdir@/niepce-main/src/libraryclient/clientinterface.rs \
-       @top_srcdir@/niepce-main/src/libraryclient/mod.rs \
-       @top_srcdir@/niepce-main/src/niepce/mod.rs \
-       @top_srcdir@/niepce-main/src/niepce/ui/mod.rs \
+       @top_srcdir@/niepce-main/src/niepce.rs \
+       @top_srcdir@/niepce-main/src/niepce/ui.rs \
        @top_srcdir@/niepce-main/src/niepce/ui/imagetoolbar.rs \
        @top_srcdir@/niepce-main/src/niepce/ui/image_grid_view.rs \
        @top_srcdir@/niepce-main/src/niepce/ui/image_list_store.rs \
-       @top_srcdir@/niepce-main/src/niepce/ui/dialogs/mod.rs \
+       @top_srcdir@/niepce-main/src/niepce/ui/dialogs.rs \
        @top_srcdir@/niepce-main/src/niepce/ui/dialogs/confirm.rs \
        @top_srcdir@/niepce-main/src/niepce/ui/dialogs/requestnewfolder.rs \
        @top_srcdir@/niepce-main/src/niepce/ui/thumb_nav.rs \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]