Merge pull request #1998 from vibe-d/remove_compatibility_code

Remove 2.071.x compatibility code merged-on-behalf-of: Sönke Ludwig <[email protected]>
vibe-d · Dec 12, 2017 · 935385a · 935385a
2 parents dc634d8 + e923586
commit 935385a
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -52,7 +52,7 @@ matrix:
 
 before_install:
   - pyenv global system 3.5
-  - pip3 install 'meson>=0.42,!=0.43'
+  - pip3 install 'meson>=0.42,!=0.43,!=0.44'
 
 install:
   - mkdir .ntmp

diff --git a/README.md b/README.md
@@ -48,17 +48,20 @@ Support
 Vibe.d aims to support at least the 3 latest minor releases of D.
 At the moment, the following compilers are supported and tested:
 
-- DMD 2.077.0
+- DMD 2.077.1
 - DMD 2.076.1
 - DMD 2.075.1
 - DMD 2.074.1
 - DMD 2.073.2
 - DMD 2.072.2 **Warning: 2.072.0 and 2.072.1 are affected by a serious DMD regression: [16980](https://issues.dlang.org/show_bug.cgi?id=16980)**
-- DMD 2.071.2
+- LDC 1.6.0 (FE: 2.076.1)
 - LDC 1.5.0 (FE: 2.075.1)
 - LDC 1.4.0 (FE: 2.074.1)
 - LDC 1.3.0 (FE: 2.073.2)
 - LDC 1.2.0 (FE: 2.072.2)
+
+Up to 0.8.1:
+- DMD 2.071.2
 - LDC 1.1.1 (FE: 2.071.2)
 
 Up to 0.8.0:

diff --git a/core/vibe/internal/freelistref.d b/core/vibe/internal/freelistref.d
@@ -196,10 +196,7 @@ in {
 
 	// Initialize the object in its pre-ctor state
 	() @trusted {
-		static if (__VERSION__ < 2071)
-			chunk[0 .. classSize] = typeid(T).init[];
-		else
-			chunk[0 .. classSize] = typeid(T).initializer[]; // Avoid deprecation warning
+		chunk[0 .. classSize] = typeid(T).initializer[]; // Avoid deprecation warning
 	} ();
 
 	// Call the ctor if any

diff --git a/textfilter/vibe/textfilter/urlencode.d b/textfilter/vibe/textfilter/urlencode.d
@@ -254,10 +254,7 @@ private struct StringSliceAppender(S) {
 	{
 		import std.encoding : encode;
 		char[6] chars;
-		static if (__VERSION__ < 2072)
-			auto n = () @trusted { return encode(ch, chars[]); } ();
-		else
-			auto n = encode(ch, chars[]);
+		auto n = encode(ch, chars[]);
 		foreach (char c; chars[0 .. n]) put(c);
 	}
 

diff --git a/utils/vibe/internal/memory_legacy.d b/utils/vibe/internal/memory_legacy.d
@@ -834,10 +834,7 @@ in {
 	auto result = cast(T) chunk.ptr;
 
 	// Initialize the object in its pre-ctor state
-	static if (__VERSION__ < 2071)
-		chunk[0 .. classSize] = typeid(T).init[];
-	else
-		chunk[0 .. classSize] = typeid(T).initializer[]; // Avoid deprecation warning
+	chunk[0 .. classSize] = typeid(T).initializer[]; // Avoid deprecation warning
 
 	// Call the ctor if any
 	static if (is(typeof(result.__ctor(args))))

diff --git a/utils/vibe/internal/meta/funcattr.d b/utils/vibe/internal/meta/funcattr.d
@@ -183,7 +183,7 @@ unittest {
 */
 auto computeAttributedParameter(alias FUNCTION, string NAME, ARGS...)(ARGS args)
 {
-	import std.typetuple : Filter;
+	import std.meta : Filter;
 	static assert(IsAttributedParameter!(FUNCTION, NAME), "Missing @before attribute for parameter "~NAME);
 	alias input_attributes = Filter!(isInputAttribute, RecursiveFunctionAttributes!FUNCTION);
 	foreach (att; input_attributes)
@@ -203,10 +203,7 @@ auto computeAttributedParameter(alias FUNCTION, string NAME, ARGS...)(ARGS args)
 */
 auto computeAttributedParameterCtx(alias FUNCTION, string NAME, T, ARGS...)(T ctx, ARGS args)
 {
-	static if (__VERSION__ >= 2072)
-		import std.typetuple : AliasSeq, Filter;
-	else
-		import std.typetuple : AliasSeq = TypeTuple, Filter;
+	import std.meta : AliasSeq, Filter;
 	static assert(IsAttributedParameter!(FUNCTION, NAME), "Missing @before attribute for parameter "~NAME);
 	alias input_attributes = Filter!(isInputAttribute, RecursiveFunctionAttributes!FUNCTION);
 	foreach (att; input_attributes)

diff --git a/utils/vibe/internal/utilallocator.d b/utils/vibe/internal/utilallocator.d
@@ -20,10 +20,7 @@ final class RegionListAllocator(Allocator, bool leak = false) : IAllocator {
 	import std.algorithm.comparison : min, max;
 	import std.conv : emplace;
 
-	static if (__VERSION__ < 2072)
-		import stdx.allocator.common : Ternary;
-	else
-		import std.typecons : Ternary;
+	import std.typecons : Ternary;
 
 	static struct Pool { Pool* next; void[] data; void[] remaining; }
 	private {

diff --git a/utils/vibe/utils/array.d b/utils/vibe/utils/array.d
@@ -582,8 +582,6 @@ struct ArraySet(Key)
 
 	~this()
 	@trusted {
-		static if (__VERSION__ <= 2071)
-			scope (failure) assert(false);
 		if (m_entries.ptr) {
 			if (--allocator.prefix(m_entries) <= 0) {
 				try allocator.dispose(m_entries);
@@ -594,17 +592,13 @@ struct ArraySet(Key)
 
 	this(this)
 	@trusted {
-		static if (__VERSION__ <= 2071)
-			scope (failure) assert(false);
 		if (m_entries.ptr) {
 			allocator.prefix(m_entries)++;
 		}
 	}
 
 	@property ArraySet dup()
 	{
-		static if (__VERSION__ <= 2071)
-			scope (failure) assert(false);
 		ArraySet ret;
 		ret.m_staticEntries = m_staticEntries;
 		ret.m_allocator = m_allocator;

diff --git a/utils/vibe/utils/validation.d b/utils/vibe/utils/validation.d
@@ -67,11 +67,9 @@ bool validateEmail(R)(ref R error_sink, string str, size_t max_length = 64)
 		return false;
 	}
 
-	static if (__VERSION__ >= 2072) {
-		if (() @trusted { return !isEmail(str); }()) {
-			error_sink.put("The email address is invalid.");
-			return false;
-		}
+	if (() @trusted { return !isEmail(str); }()) {
+		error_sink.put("The email address is invalid.");
+		return false;
 	}
 
 	return true;