Skip to content

Commit 380032e

Browse files
committed
Use tomlf directly
1 parent dc9a89c commit 380032e

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

src/fpm/cmd/new.f90

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,8 +673,7 @@ end subroutine create_verified_basic_manifest
673673
subroutine validate_toml_data(input)
674674
!> verify a string array is a valid fpm.toml file
675675
!
676-
use tomlf, only : toml_load
677-
use fpm_toml, only : toml_table, toml_serialize
676+
use tomlf, only : toml_table, toml_load, toml_serialize
678677
implicit none
679678
character(kind=tfc,len=:),intent(in),allocatable :: input(:)
680679
character(len=1), parameter :: nl = new_line('a')

src/fpm/manifest.f90

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ module fpm_manifest
1414
use fpm_manifest_preprocess, only : preprocess_config_t
1515
use fpm_manifest_package, only : package_config_t, new_package
1616
use fpm_error, only : error_t, fatal_error
17-
use fpm_toml, only : toml_table, read_package_file
17+
use tomlf, only : toml_table
18+
use fpm_toml, only : read_package_file
1819
use fpm_manifest_test, only : test_config_t
1920
use fpm_filesystem, only: join_path, exists, dirname, is_dir
2021
use fpm_environment, only: os_is_unix

test/fpm_test/test_package_dependencies.f90

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ module test_package_dependencies
99
use fpm_manifest_dependency
1010
use fpm_manifest_metapackages, only: metapackage_config_t
1111
use fpm_manifest, only: package_config_t, get_package_data
12-
use fpm_toml
12+
use tomlf, only: toml_table, new_table
13+
use fpm_toml, only: toml_key, add_table, set_value, get_value
1314
use fpm_settings, only: fpm_global_settings, get_registry_settings, get_global_settings
1415
use fpm_downloader, only: downloader_t
1516
use fpm_versioning, only: version_t

test/fpm_test/test_settings.f90

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ module test_settings
33
use fpm_settings, only: fpm_global_settings, get_global_settings, get_registry_settings, official_registry_base_url
44
use fpm_filesystem, only: is_dir, join_path, mkdir, filewrite, os_delete_dir, exists, get_local_prefix
55
use fpm_environment, only: os_is_unix
6-
use fpm_toml, only: toml_table, new_table, add_table, set_value
6+
use tomlf, only: toml_table, new_table
7+
use fpm_toml, only: add_table, set_value
78
use fpm_os, only: get_absolute_path, get_current_directory
89

910
implicit none

0 commit comments

Comments
 (0)