From 687585f9bab5237f0f08babf974801a62d1e4403 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Thu, 23 Jun 2022 11:20:26 +0200 Subject: [PATCH 1/2] Manifest: remove manual opens in main.ml --- devtools/get_contracts/dune | 23 +++++----- manifest/main.ml | 42 +++++++++++-------- src/lib_context/test/dune | 2 +- src/proto_000_Ps9mPmXa/lib_protocol/dune | 4 +- src/proto_001_PtCJ7pwo/lib_protocol/dune | 4 +- src/proto_002_PsYLVpVv/lib_protocol/dune | 4 +- src/proto_003_PsddFKi3/lib_protocol/dune | 4 +- src/proto_004_Pt24m4xi/lib_protocol/dune | 4 +- src/proto_005_PsBABY5H/lib_protocol/dune | 4 +- src/proto_005_PsBabyM1/lib_protocol/dune | 4 +- src/proto_006_PsCARTHA/lib_protocol/dune | 4 +- src/proto_007_PsDELPH1/lib_protocol/dune | 4 +- src/proto_008_PtEdo2Zk/lib_protocol/dune | 4 +- src/proto_008_PtEdoTez/lib_protocol/dune | 4 +- src/proto_009_PsFLoren/lib_protocol/dune | 4 +- src/proto_010_PtGRANAD/lib_protocol/dune | 4 +- src/proto_011_PtHangz2/lib_protocol/dune | 4 +- .../lib_delegate/test/mockup_simulator/dune | 4 +- src/proto_012_Psithaca/lib_protocol/dune | 4 +- .../lib_delegate/test/mockup_simulator/dune | 4 +- src/proto_013_PtJakart/lib_protocol/dune | 4 +- .../lib_delegate/test/mockup_simulator/dune | 4 +- src/proto_alpha/lib_protocol/dune | 4 +- src/proto_demo_counter/lib_protocol/dune | 4 +- src/proto_demo_noops/lib_protocol/dune | 4 +- src/proto_genesis/lib_protocol/dune | 4 +- 26 files changed, 84 insertions(+), 75 deletions(-) diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune index 9a1d6fc8682e..67c2304355b8 100644 --- a/devtools/get_contracts/dune +++ b/devtools/get_contracts/dune @@ -4,53 +4,56 @@ (library (name get_contracts) (libraries + tezos-micheline + tezos-base + tezos-stdlib-unix tezos-client-base-unix tezos-store) (flags (:standard) -open Tezos_micheline - -open Tezos_base__TzPervasives + -open Tezos_base.TzPervasives -open Tezos_stdlib_unix) (modules get_contracts sigs storage_helpers)) (executable (name get_contracts_012_Psithaca) (libraries + tezos-base tezos-protocol-012-Psithaca tezos-client-012-Psithaca get_contracts) (flags (:standard) - -open Tezos_base__TzPervasives - -open Tezos_raw_protocol_012_Psithaca - -open Tezos_protocol_environment_012_Psithaca + -open Tezos_base.TzPervasives + -open Tezos_protocol_012_Psithaca.Protocol -open Tezos_client_012_Psithaca) (modules get_contracts_012_Psithaca)) (executable (name get_contracts_013_PtJakart) (libraries + tezos-base tezos-protocol-013-PtJakart tezos-client-013-PtJakart get_contracts) (flags (:standard) - -open Tezos_base__TzPervasives - -open Tezos_raw_protocol_013_PtJakart - -open Tezos_protocol_environment_013_PtJakart + -open Tezos_base.TzPervasives + -open Tezos_protocol_013_PtJakart.Protocol -open Tezos_client_013_PtJakart) (modules get_contracts_013_PtJakart)) (executable (name get_contracts_alpha) (libraries + tezos-base tezos-protocol-alpha tezos-client-alpha get_contracts) (flags (:standard) - -open Tezos_base__TzPervasives - -open Tezos_raw_protocol_alpha - -open Tezos_protocol_environment_alpha + -open Tezos_base.TzPervasives + -open Tezos_protocol_alpha.Protocol -open Tezos_client_alpha) (modules get_contracts_alpha)) diff --git a/manifest/main.ml b/manifest/main.ml index 36a6189813bf..55a004ede15c 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -2232,16 +2232,14 @@ let _tezos_context_merkle_proof_tests = ~opam:"tezos-context" ~deps: [ - tezos_base; + tezos_base |> open_ ~m:"TzPervasives"; tezos_base_unix; - tezos_context_disk; + tezos_context_disk |> open_; tezos_context_encoding; - tezos_stdlib_unix; + tezos_stdlib_unix |> open_; qcheck_alcotest; tezos_test_helpers; ] - ~opens: - ["Tezos_base__TzPervasives"; "Tezos_context_disk"; "Tezos_stdlib_unix"] ~modules:["test_merkle_proof"] let tezos_validator_lib = @@ -3420,8 +3418,12 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end ~nostdlib:true ~disable_warnings ()) - ~deps:[environment |> open_ ~m:"Environment"] - ~opens:["Pervasives"; "Error_monad"] + ~deps: + [ + environment |> open_ ~m:"Environment" + |> open_ ~m:"Environment.Pervasives" + |> open_ ~m:"Environment.Error_monad"; + ] in let main = public_lib @@ -4045,7 +4047,7 @@ include Tezos_raw_protocol_%s.Main [ tezos_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; - main |> open_; + main |> open_ |> open_ ~m:"Protocol"; client |> if_some |> open_; tezos_client_commands |> open_; baking |> open_; @@ -4057,7 +4059,6 @@ include Tezos_raw_protocol_%s.Main tezos_mockup_commands; tenderbrute |> if_some |> if_ N.(number >= 013) |> open_; ] - ~opens:[sf "Tezos_protocol_%s.Protocol" name_underscore] ~bisect_ppx:false in test @@ -4693,9 +4694,15 @@ let get_contracts_lib = ~path:"devtools/get_contracts" ~synopsis:"Generic tool to extract smart contracts from node's context." ~opam:"" - ~deps:[tezos_client_base_unix; tezos_store] + ~deps: + [ + tezos_micheline |> open_; + tezos_base |> open_ ~m:"TzPervasives"; + tezos_stdlib_unix |> open_; + tezos_client_base_unix; + tezos_store; + ] ~modules:["get_contracts"; "sigs"; "storage_helpers"] - ~opens:["Tezos_micheline"; "Tezos_base__TzPervasives"; "Tezos_stdlib_unix"] ~static:false ~release:false ~bisect_ppx:false @@ -4727,15 +4734,14 @@ let _get_contracts = ~path ~synopsis:"A script to extract smart contracts from a node." ~opam:"" - ~deps:[main; client; get_contracts_lib] - ~modules:[name] - ~opens: + ~deps: [ - "Tezos_base__TzPervasives"; - "Tezos_raw_protocol_" ^ proto_version; - "Tezos_protocol_environment_" ^ proto_version; - "Tezos_client_" ^ proto_version; + tezos_base |> open_ ~m:"TzPervasives"; + main |> open_ ~m:"Protocol"; + client |> open_; + get_contracts_lib; ] + ~modules:[name] ~static:false ~release:false ~bisect_ppx:false) diff --git a/src/lib_context/test/dune b/src/lib_context/test/dune index 886bc6300482..3cd00dc32594 100644 --- a/src/lib_context/test/dune +++ b/src/lib_context/test/dune @@ -36,7 +36,7 @@ tezos-test-helpers) (flags (:standard) - -open Tezos_base__TzPervasives + -open Tezos_base.TzPervasives -open Tezos_context_disk -open Tezos_stdlib_unix) (modules test_merkle_proof)) diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune index 32ac6bee9b9f..58ce0bf12ebe 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_000_Ps9mPmXa.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_000_Ps9mPmXa.Environment.Pervasives + -open Tezos_protocol_environment_000_Ps9mPmXa.Environment.Error_monad) (modules Data Services Main)) (library diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune index cf4058affb71..8c60cee2b464 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_001_PtCJ7pwo.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_001_PtCJ7pwo.Environment.Pervasives + -open Tezos_protocol_environment_001_PtCJ7pwo.Environment.Error_monad) (modules Misc Storage_description diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune index 5b785dd95868..d3f2396002e3 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_002_PsYLVpVv.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_002_PsYLVpVv.Environment.Pervasives + -open Tezos_protocol_environment_002_PsYLVpVv.Environment.Error_monad) (modules Misc Storage_description diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune index 978f72ec5019..8667695ff876 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune +++ b/src/proto_003_PsddFKi3/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_003_PsddFKi3.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_003_PsddFKi3.Environment.Pervasives + -open Tezos_protocol_environment_003_PsddFKi3.Environment.Error_monad) (modules Misc Storage_description diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune index 2936be4bb22e..dc66d652e643 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_004_Pt24m4xi.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_004_Pt24m4xi.Environment.Pervasives + -open Tezos_protocol_environment_004_Pt24m4xi.Environment.Error_monad) (modules Misc Storage_description diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune index c6d8917528ff..c4e6e51224be 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune +++ b/src/proto_005_PsBABY5H/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_005_PsBABY5H.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_005_PsBABY5H.Environment.Pervasives + -open Tezos_protocol_environment_005_PsBABY5H.Environment.Error_monad) (modules Misc Storage_description diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune index 8b6969e9c5f8..c3bfebcfcad1 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune +++ b/src/proto_005_PsBabyM1/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_005_PsBabyM1.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_005_PsBabyM1.Environment.Pervasives + -open Tezos_protocol_environment_005_PsBabyM1.Environment.Error_monad) (modules Misc Storage_description diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune index 8770d0b3374d..027c920287e2 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_006_PsCARTHA.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_006_PsCARTHA.Environment.Pervasives + -open Tezos_protocol_environment_006_PsCARTHA.Environment.Error_monad) (modules Misc Storage_description diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune index d0279cc6df2b..c9f1c061a20d 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_007_PsDELPH1.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_007_PsDELPH1.Environment.Pervasives + -open Tezos_protocol_environment_007_PsDELPH1.Environment.Error_monad) (modules Misc Storage_description diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune index e4592dccc26c..4ae52ab0c924 100644 --- a/src/proto_008_PtEdo2Zk/lib_protocol/dune +++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_008_PtEdo2Zk.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_008_PtEdo2Zk.Environment.Pervasives + -open Tezos_protocol_environment_008_PtEdo2Zk.Environment.Error_monad) (modules Misc Storage_description diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune index e2cfe23826d0..3bb5e7df9773 100644 --- a/src/proto_008_PtEdoTez/lib_protocol/dune +++ b/src/proto_008_PtEdoTez/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_008_PtEdoTez.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_008_PtEdoTez.Environment.Pervasives + -open Tezos_protocol_environment_008_PtEdoTez.Environment.Error_monad) (modules Misc Storage_description diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune index c2cb0a47d479..1298297d0676 100644 --- a/src/proto_009_PsFLoren/lib_protocol/dune +++ b/src/proto_009_PsFLoren/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_009_PsFLoren.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_009_PsFLoren.Environment.Pervasives + -open Tezos_protocol_environment_009_PsFLoren.Environment.Error_monad) (modules Misc Storage_description diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune index d13d8ab156a2..dc19fba99792 100644 --- a/src/proto_010_PtGRANAD/lib_protocol/dune +++ b/src/proto_010_PtGRANAD/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_010_PtGRANAD.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_010_PtGRANAD.Environment.Pervasives + -open Tezos_protocol_environment_010_PtGRANAD.Environment.Error_monad) (modules Misc Storage_description diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune index 515237f9fad3..fc72160e4e7e 100644 --- a/src/proto_011_PtHangz2/lib_protocol/dune +++ b/src/proto_011_PtHangz2/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_011_PtHangz2.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_011_PtHangz2.Environment.Pervasives + -open Tezos_protocol_environment_011_PtHangz2.Environment.Error_monad) (modules Misc Path_encoding diff --git a/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune index 7e4cb5663959..4f7cc505e3bd 100644 --- a/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune @@ -21,10 +21,10 @@ -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_protocol_012_Psithaca + -open Tezos_protocol_012_Psithaca.Protocol -open Tezos_client_012_Psithaca -open Tezos_client_commands -open Tezos_baking_012_Psithaca -open Tezos_stdlib_unix -open Tezos_client_base_unix - -open Tezos_protocol_012_Psithaca_parameters - -open Tezos_protocol_012_Psithaca.Protocol)) + -open Tezos_protocol_012_Psithaca_parameters)) diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune index d154bf99c2b4..f2fec7d70ddd 100644 --- a/src/proto_012_Psithaca/lib_protocol/dune +++ b/src/proto_012_Psithaca/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_012_Psithaca.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_012_Psithaca.Environment.Pervasives + -open Tezos_protocol_environment_012_Psithaca.Environment.Error_monad) (modules Misc Non_empty_string diff --git a/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune b/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune index a93b72e35f7f..fd92734efec6 100644 --- a/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune @@ -22,11 +22,11 @@ -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_protocol_013_PtJakart + -open Tezos_protocol_013_PtJakart.Protocol -open Tezos_client_013_PtJakart -open Tezos_client_commands -open Tezos_baking_013_PtJakart -open Tezos_stdlib_unix -open Tezos_client_base_unix -open Tezos_protocol_013_PtJakart_parameters - -open Tenderbrute_013_PtJakart - -open Tezos_protocol_013_PtJakart.Protocol)) + -open Tenderbrute_013_PtJakart)) diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune index d57e7c984d5d..afc184e15804 100644 --- a/src/proto_013_PtJakart/lib_protocol/dune +++ b/src/proto_013_PtJakart/lib_protocol/dune @@ -30,8 +30,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_013_PtJakart.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_013_PtJakart.Environment.Pervasives + -open Tezos_protocol_environment_013_PtJakart.Environment.Error_monad) (modules Misc Non_empty_string diff --git a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune index ce67573ed371..c459c163af1f 100644 --- a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune @@ -22,11 +22,11 @@ -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_protocol_alpha + -open Tezos_protocol_alpha.Protocol -open Tezos_client_alpha -open Tezos_client_commands -open Tezos_baking_alpha -open Tezos_stdlib_unix -open Tezos_client_base_unix -open Tezos_protocol_alpha_parameters - -open Tenderbrute_alpha - -open Tezos_protocol_alpha.Protocol)) + -open Tenderbrute_alpha)) diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index 9b95561eac90..9a8adc5e1fc9 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -29,8 +29,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_alpha.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_alpha.Environment.Pervasives + -open Tezos_protocol_environment_alpha.Environment.Error_monad) (modules Misc Non_empty_string diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune index b28cef118083..9a7b2f639f96 100644 --- a/src/proto_demo_counter/lib_protocol/dune +++ b/src/proto_demo_counter/lib_protocol/dune @@ -29,8 +29,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_demo_counter.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_demo_counter.Environment.Pervasives + -open Tezos_protocol_environment_demo_counter.Environment.Error_monad) (modules Error Proto_params diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune index 0a8d9d0b42c2..3b1156ef45db 100644 --- a/src/proto_demo_noops/lib_protocol/dune +++ b/src/proto_demo_noops/lib_protocol/dune @@ -29,8 +29,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_demo_noops.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_demo_noops.Environment.Pervasives + -open Tezos_protocol_environment_demo_noops.Environment.Error_monad) (modules Main)) (library diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune index 254b24e9ddf4..eadde9cfba25 100644 --- a/src/proto_genesis/lib_protocol/dune +++ b/src/proto_genesis/lib_protocol/dune @@ -29,8 +29,8 @@ -nostdlib -nopervasives -open Tezos_protocol_environment_genesis.Environment - -open Pervasives - -open Error_monad) + -open Tezos_protocol_environment_genesis.Environment.Pervasives + -open Tezos_protocol_environment_genesis.Environment.Error_monad) (modules Data Services Main)) (library -- GitLab From f03812db8a706cf322286bb6872a0bd7c36a131c Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Thu, 23 Jun 2022 11:25:53 +0200 Subject: [PATCH 2/2] Manifest: remove ~opens argument --- manifest/manifest.ml | 5 ++--- manifest/manifest.mli | 10 +++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index eff5320ba98f..f67e3da2cf7e 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -1070,7 +1070,6 @@ module Target = struct ?ocaml:Version.constraints -> ?opam:string -> ?opam_with_test:with_test -> - ?opens:string list -> ?preprocess:preprocessor list -> ?preprocessor_deps:preprocessor_dep list -> ?private_modules:string list -> @@ -1144,7 +1143,7 @@ module Target = struct ?(dune = Dune.[]) ?flags ?foreign_stubs ?implements ?inline_tests ?js_compatible ?js_of_ocaml ?documentation ?(linkall = false) ?modes ?modules ?(modules_without_implementation = []) ?(npm_deps = []) ?ocaml - ?opam ?(opam_with_test = Always) ?(opens = []) ?(preprocess = []) + ?opam ?(opam_with_test = Always) ?(preprocess = []) ?(preprocessor_deps = []) ?(private_modules = []) ?(opam_only_deps = []) ?release ?static ?synopsis ?description ?(time_measurement_ppx = false) ?(virtual_modules = []) ?default_implementation ?(wrapped = true) @@ -1165,7 +1164,7 @@ module Target = struct | Optional target | Select {package = target; _} -> get_opens acc target | Open (target, module_name) -> get_opens (module_name :: acc) target in - List.flatten (List.map (get_opens []) deps) @ opens + List.flatten (List.map (get_opens []) deps) in let js_compatible, js_of_ocaml = match (js_compatible, js_of_ocaml) with diff --git a/manifest/manifest.mli b/manifest/manifest.mli index 56f18508bd2c..7ff57d03c14b 100644 --- a/manifest/manifest.mli +++ b/manifest/manifest.mli @@ -595,9 +595,6 @@ type with_test = Always | Never | Only_on_64_arch - [opam_with_test]: whether to add the [dune runtest] command. Note that for a given package all targets must have the same value of [opam_with_test]. - - [opens]: list of module names to open when compiling. - They are passed as [-open] flags to the OCaml compiler (in the [(flags ...)] stanza). - - [path]: path of the directory in which to generate the [dune] file for this target. - [preprocess]: preprocessor directives to add using the [(preprocess ...)] stanza. @@ -665,7 +662,6 @@ type 'a maker = ?ocaml:Version.constraints -> ?opam:string -> ?opam_with_test:with_test -> - ?opens:string list -> ?preprocess:preprocessor list -> ?preprocessor_deps:preprocessor_dep list -> ?private_modules:string list -> @@ -958,11 +954,11 @@ val optional : target -> target If [m] is specified, open this submodule instead of the main module. When such targets appear in [?deps] of a target [maker], they are - automatically prepended to [?opens] in the order of declaration in [?deps]. + converted into [-open] in the order of declaration in [?deps]. If you use [open_] on an [open_], the innermost [open_]s is opened first; For instance, [tezos_base |> open_ |> open_ ~m: "TzPervasives"] - is target [tezos_base], but when used in [?deps], this automatically prepend - ["Tezos_base"], followed by ["Tezos_base__TzPervasives"], to [?opens]. + is target [tezos_base], but when used in [?deps], this automatically opens + ["Tezos_base"], followed by ["Tezos_base.TzPervasives"]. Can only be used on internal libraries and on external or vendored libraries for which a [main_module] was specified. *) -- GitLab