@@ -7,7 +7,7 @@ use uv_configuration::{ConfigSettings, IndexStrategy, KeyringProviderType, Targe
77use uv_resolver:: { AnnotationStyle , ExcludeNewer , PreReleaseMode , ResolutionMode } ;
88use uv_toolchain:: PythonVersion ;
99
10- use crate :: { FilesystemOptions , GlobalOptions , Options , PipOptions , ResolverInstallerOptions } ;
10+ use crate :: { FilesystemOptions , PipOptions } ;
1111
1212pub trait Combine {
1313 /// Combine two values, preferring the values in `self`.
@@ -37,58 +37,6 @@ impl Combine for Option<FilesystemOptions> {
3737 }
3838}
3939
40- impl Combine for Options {
41- fn combine ( self , other : Options ) -> Options {
42- Options {
43- globals : self . globals . combine ( other. globals ) ,
44- top_level : self . top_level . combine ( other. top_level ) ,
45- pip : self . pip . combine ( other. pip ) ,
46- override_dependencies : self
47- . override_dependencies
48- . combine ( other. override_dependencies ) ,
49- }
50- }
51- }
52-
53- impl Combine for GlobalOptions {
54- fn combine ( self , other : GlobalOptions ) -> GlobalOptions {
55- GlobalOptions {
56- native_tls : self . native_tls . combine ( other. native_tls ) ,
57- offline : self . offline . combine ( other. offline ) ,
58- no_cache : self . no_cache . combine ( other. no_cache ) ,
59- cache_dir : self . cache_dir . combine ( other. cache_dir ) ,
60- preview : self . preview . combine ( other. preview ) ,
61- }
62- }
63- }
64-
65- impl Combine for ResolverInstallerOptions {
66- fn combine ( self , other : ResolverInstallerOptions ) -> ResolverInstallerOptions {
67- ResolverInstallerOptions {
68- index_url : self . index_url . combine ( other. index_url ) ,
69- extra_index_url : self . extra_index_url . combine ( other. extra_index_url ) ,
70- no_index : self . no_index . combine ( other. no_index ) ,
71- find_links : self . find_links . combine ( other. find_links ) ,
72- index_strategy : self . index_strategy . combine ( other. index_strategy ) ,
73- keyring_provider : self . keyring_provider . combine ( other. keyring_provider ) ,
74- resolution : self . resolution . combine ( other. resolution ) ,
75- prerelease : self . prerelease . combine ( other. prerelease ) ,
76- config_settings : self . config_settings . combine ( other. config_settings ) ,
77- exclude_newer : self . exclude_newer . combine ( other. exclude_newer ) ,
78- link_mode : self . link_mode . combine ( other. link_mode ) ,
79- compile_bytecode : self . compile_bytecode . combine ( other. compile_bytecode ) ,
80- upgrade : self . upgrade . combine ( other. upgrade ) ,
81- upgrade_package : self . upgrade_package . combine ( other. upgrade_package ) ,
82- reinstall : self . reinstall . combine ( other. reinstall ) ,
83- reinstall_package : self . reinstall_package . combine ( other. reinstall_package ) ,
84- no_build : self . no_build . combine ( other. no_build ) ,
85- no_build_package : self . no_build_package . combine ( other. no_build_package ) ,
86- no_binary : self . no_binary . combine ( other. no_binary ) ,
87- no_binary_package : self . no_binary_package . combine ( other. no_binary_package ) ,
88- }
89- }
90- }
91-
9240impl Combine for Option < PipOptions > {
9341 fn combine ( self , other : Option < PipOptions > ) -> Option < PipOptions > {
9442 match ( self , other) {
@@ -98,71 +46,6 @@ impl Combine for Option<PipOptions> {
9846 }
9947}
10048
101- impl Combine for PipOptions {
102- fn combine ( self , other : PipOptions ) -> PipOptions {
103- PipOptions {
104- python : self . python . combine ( other. python ) ,
105- system : self . system . combine ( other. system ) ,
106- break_system_packages : self
107- . break_system_packages
108- . combine ( other. break_system_packages ) ,
109- target : self . target . combine ( other. target ) ,
110- prefix : self . prefix . combine ( other. prefix ) ,
111- index_url : self . index_url . combine ( other. index_url ) ,
112- extra_index_url : self . extra_index_url . combine ( other. extra_index_url ) ,
113- no_index : self . no_index . combine ( other. no_index ) ,
114- find_links : self . find_links . combine ( other. find_links ) ,
115- index_strategy : self . index_strategy . combine ( other. index_strategy ) ,
116- keyring_provider : self . keyring_provider . combine ( other. keyring_provider ) ,
117- no_build : self . no_build . combine ( other. no_build ) ,
118- no_binary : self . no_binary . combine ( other. no_binary ) ,
119- only_binary : self . only_binary . combine ( other. only_binary ) ,
120- no_build_isolation : self . no_build_isolation . combine ( other. no_build_isolation ) ,
121- strict : self . strict . combine ( other. strict ) ,
122- extra : self . extra . combine ( other. extra ) ,
123- all_extras : self . all_extras . combine ( other. all_extras ) ,
124- no_deps : self . no_deps . combine ( other. no_deps ) ,
125- resolution : self . resolution . combine ( other. resolution ) ,
126- prerelease : self . prerelease . combine ( other. prerelease ) ,
127- output_file : self . output_file . combine ( other. output_file ) ,
128- no_strip_extras : self . no_strip_extras . combine ( other. no_strip_extras ) ,
129- no_annotate : self . no_annotate . combine ( other. no_annotate ) ,
130- no_header : self . no_header . combine ( other. no_header ) ,
131- custom_compile_command : self
132- . custom_compile_command
133- . combine ( other. custom_compile_command ) ,
134- generate_hashes : self . generate_hashes . combine ( other. generate_hashes ) ,
135- legacy_setup_py : self . legacy_setup_py . combine ( other. legacy_setup_py ) ,
136- config_settings : self . config_settings . combine ( other. config_settings ) ,
137- python_version : self . python_version . combine ( other. python_version ) ,
138- python_platform : self . python_platform . combine ( other. python_platform ) ,
139- exclude_newer : self . exclude_newer . combine ( other. exclude_newer ) ,
140- no_emit_package : self . no_emit_package . combine ( other. no_emit_package ) ,
141- emit_index_url : self . emit_index_url . combine ( other. emit_index_url ) ,
142- emit_find_links : self . emit_find_links . combine ( other. emit_find_links ) ,
143- emit_marker_expression : self
144- . emit_marker_expression
145- . combine ( other. emit_marker_expression ) ,
146- emit_index_annotation : self
147- . emit_index_annotation
148- . combine ( other. emit_index_annotation ) ,
149- annotation_style : self . annotation_style . combine ( other. annotation_style ) ,
150- link_mode : self . link_mode . combine ( other. link_mode ) ,
151- compile_bytecode : self . compile_bytecode . combine ( other. compile_bytecode ) ,
152- require_hashes : self . require_hashes . combine ( other. require_hashes ) ,
153- upgrade : self . upgrade . combine ( other. upgrade ) ,
154- upgrade_package : self . upgrade_package . combine ( other. upgrade_package ) ,
155- reinstall : self . reinstall . combine ( other. reinstall ) ,
156- reinstall_package : self . reinstall_package . combine ( other. reinstall_package ) ,
157- concurrent_downloads : self
158- . concurrent_downloads
159- . combine ( other. concurrent_downloads ) ,
160- concurrent_builds : self . concurrent_builds . combine ( other. concurrent_builds ) ,
161- concurrent_installs : self . concurrent_installs . combine ( other. concurrent_installs ) ,
162- }
163- }
164- }
165-
16649macro_rules! impl_combine_or {
16750 ( $name: ident) => {
16851 impl Combine for Option <$name> {
0 commit comments