Skip to content

Commit 64093b1

Browse files
committed
remove duplicate operator(==) for git_target_t
1 parent c5cee45 commit 64093b1

File tree

3 files changed

+2
-20
lines changed

3 files changed

+2
-20
lines changed

src/fpm/dependency.f90

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ module fpm_dependency
6060
use fpm_error, only: error_t, fatal_error
6161
use fpm_filesystem, only: exists, join_path, mkdir, canon_path, windows_path, list_files, is_dir, basename, &
6262
os_delete_dir, get_temp_filename
63-
use fpm_git, only: git_target_revision, git_target_default, git_revision, operator(==), &
64-
serializable_t
63+
use fpm_git, only: git_target_revision, git_target_default, git_revision, serializable_t
6564
use fpm_manifest, only: package_config_t, dependency_config_t, get_package_data
6665
use fpm_manifest_dependency, only: manifest_has_changed, dependency_destroy
6766
use fpm_manifest_preprocess, only: operator(==)

src/fpm/git.f90

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ module fpm_git
6262

6363
end type git_target_t
6464

65-
66-
interface operator(==)
67-
module procedure git_target_eq
68-
end interface
69-
7065
!> Common output format for writing to the command line
7166
character(len=*), parameter :: out_fmt = '("#", *(1x, g0))'
7267

@@ -144,18 +139,6 @@ function git_target_tag(url, tag) result(self)
144139

145140
end function git_target_tag
146141

147-
!> Check that two git targets are equal
148-
logical function git_target_eq(this,that) result(is_equal)
149-
150-
!> Two input git targets
151-
type(git_target_t), intent(in) :: this,that
152-
153-
is_equal = this%descriptor == that%descriptor .and. &
154-
this%url == that%url .and. &
155-
this%object == that%object
156-
157-
end function git_target_eq
158-
159142
!> Check that two git targets are equal
160143
logical function git_is_same(this,that)
161144
class(git_target_t), intent(in) :: this

src/fpm/manifest/dependency.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
module fpm_manifest_dependency
2626
use fpm_error, only: error_t, syntax_error, fatal_error
2727
use fpm_git, only: git_target_t, git_target_tag, git_target_branch, &
28-
& git_target_revision, git_target_default, operator(==), git_matches_manifest
28+
& git_target_revision, git_target_default, git_matches_manifest
2929
use fpm_toml, only: toml_table, toml_key, toml_stat, get_value, check_keys, serializable_t, add_table, &
3030
& set_value, set_string
3131
use fpm_filesystem, only: windows_path, join_path

0 commit comments

Comments
 (0)