@@ -179,17 +179,19 @@ struct Dependency {
179
179
(VersionRange v) => v,
180
180
);
181
181
enforce(range.isExactVersion(),
182
- " Dependency " ~ this .versionSpec ~ " is no exact version." );
182
+ " Dependency " ~ range.toString() ~ " is no exact version." );
183
183
return range.m_versA;
184
184
}
185
185
186
186
// / Sets/gets the matching version range as a specification string.
187
+ deprecated (" Create a new `Dependency` instead and provide a `VersionRange`" )
187
188
@property void versionSpec(string ves) @trusted
188
189
{
189
190
this .m_value = VersionRange.fromString(ves);
190
191
}
191
192
192
193
// / ditto
194
+ deprecated (" Use `Dependency.visit` and match `VersionRange`instead" )
193
195
@property string versionSpec() const @safe {
194
196
return this .m_value.match! (
195
197
(const NativePath p) => ANY_IDENT ,
@@ -481,19 +483,19 @@ public auto visit (Handlers...) (auto ref Dependency dep)
481
483
482
484
unittest {
483
485
Dependency a = Dependency(" >=1.1.0" ), b = Dependency(" >=1.3.0" );
484
- assert (a.merge(b).valid() && a.merge(b).versionSpec == " >=1.3.0" , a.merge(b).toString());
486
+ assert (a.merge(b).valid() && a.merge(b).toString() == " >=1.3.0" , a.merge(b).toString());
485
487
486
488
assertThrown(Dependency(" <=2.0.0 >=1.0.0" ));
487
489
assertThrown(Dependency(" >=2.0.0 <=1.0.0" ));
488
490
489
491
a = Dependency(" >=1.0.0 <=5.0.0" ); b = Dependency(" >=2.0.0" );
490
- assert (a.merge(b).valid() && a.merge(b).versionSpec == " >=2.0.0 <=5.0.0" , a.merge(b).toString());
492
+ assert (a.merge(b).valid() && a.merge(b).toString() == " >=2.0.0 <=5.0.0" , a.merge(b).toString());
491
493
492
494
assertThrown(a = Dependency(" >1.0.0 ==5.0.0" ), " Construction is invalid" );
493
495
494
496
a = Dependency(" >1.0.0" ); b = Dependency(" <2.0.0" );
495
497
assert (a.merge(b).valid(), a.merge(b).toString());
496
- assert (a.merge(b).versionSpec == " >1.0.0 <2.0.0" , a.merge(b).toString());
498
+ assert (a.merge(b).toString() == " >1.0.0 <2.0.0" , a.merge(b).toString());
497
499
498
500
a = Dependency(" >2.0.0" ); b = Dependency(" <1.0.0" );
499
501
assert (! (a.merge(b)).valid(), a.merge(b).toString());
@@ -649,13 +651,13 @@ unittest {
649
651
}
650
652
651
653
unittest {
652
- assert (Dependency (" ~>1.0.4" ).versionSpec == " ~>1.0.4" );
653
- assert (Dependency (" ~>1.4" ).versionSpec == " ~>1.4" );
654
- assert (Dependency (" ~>2" ).versionSpec == " ~>2" );
655
- assert (Dependency (" ~>1.0.4+1.2.3" ).versionSpec == " ~>1.0.4" );
656
- assert (Dependency (" ^0.1.2" ).versionSpec == " ^0.1.2" );
657
- assert (Dependency (" ^1.2.3" ).versionSpec == " ^1.2.3" );
658
- assert (Dependency (" ^1.2" ).versionSpec == " ~>1.2" ); // equivalent; prefer ~>
654
+ assert (VersionRange.fromString (" ~>1.0.4" ).toString() == " ~>1.0.4" );
655
+ assert (VersionRange.fromString (" ~>1.4" ).toString() == " ~>1.4" );
656
+ assert (VersionRange.fromString (" ~>2" ).toString() == " ~>2" );
657
+ assert (VersionRange.fromString (" ~>1.0.4+1.2.3" ).toString() == " ~>1.0.4" );
658
+ assert (VersionRange.fromString (" ^0.1.2" ).toString() == " ^0.1.2" );
659
+ assert (VersionRange.fromString (" ^1.2.3" ).toString() == " ^1.2.3" );
660
+ assert (VersionRange.fromString (" ^1.2" ).toString() == " ~>1.2" ); // equivalent; prefer ~>
659
661
}
660
662
661
663
/**
0 commit comments