From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 5C2E61F5A2 for ; Sun, 5 Jan 2020 23:23:37 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 4/6] admin: do not lazy-load Inbox or Config packages Date: Sun, 5 Jan 2020 23:23:34 +0000 Message-Id: <20200105232336.26023-5-e@yhbt.net> In-Reply-To: <20200105232336.26023-1-e@yhbt.net> References: <20200105232336.26023-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: No point in lazy-loading these, since they're always loaded anyways and would not have portability problems on systems with minimal dependencies. --- lib/PublicInbox/Admin.pm | 4 ++-- lib/PublicInbox/Config.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm index 44b44b6e..1f1b133d 100644 --- a/lib/PublicInbox/Admin.pm +++ b/lib/PublicInbox/Admin.pm @@ -9,7 +9,8 @@ use warnings; use Cwd 'abs_path'; use base qw(Exporter); our @EXPORT_OK = qw(resolve_repo_dir); -require PublicInbox::Config; +use PublicInbox::Config; +use PublicInbox::Inbox; use PublicInbox::Spawn qw(popen_rd); sub resolve_repo_dir { @@ -68,7 +69,6 @@ sub unconfigured_ibx ($$) { sub resolve_inboxes ($;$$) { my ($argv, $opt, $cfg) = @_; - require PublicInbox::Inbox; $opt ||= {}; $cfg //= eval { PublicInbox::Config->new }; diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index ffc31f83..cc8c1eaf 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -10,7 +10,7 @@ package PublicInbox::Config; use strict; use warnings; -require PublicInbox::Inbox; +use PublicInbox::Inbox; use PublicInbox::Spawn qw(popen_rd); sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] }