Merge pull request #16 from vibe-d/issue_15_compile_error

s-ludwig · web-flow · commit 60f044fdeddc · 2025-01-04T21:04:14.000+01:00
Ensure HashMap destruction works in safe code
diff --git a/source/vibe/container/hashmap.d b/source/vibe/container/hashmap.d
@@ -321,7 +321,7 @@ struct HashMap(TKey, TValue, Traits = DefaultHashMapTraits!TKey, Allocator = IAl
 	}
 }
 
-nothrow unittest {
+@safe nothrow unittest {
 	import std.conv;
 
 	HashMap!(string, string) map;
diff --git a/source/vibe/container/internal/rctable.d b/source/vibe/container/internal/rctable.d
@@ -44,7 +44,7 @@ struct RCTable(T, Allocator = IAllocator) {
 	}
 
 	~this()
-	{
+	@trusted {
 		if (m_table.ptr && --this.refCount == 0) {
 			static if (hasIndirections!T) {
 				if (m_table.ptr !is null) () @trusted {

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ struct HashMap(TKey, TValue, Traits = DefaultHashMapTraits!TKey, Allocator = IAl`
`321`	`321`	`}`
`322`	`322`	`}`
`323`	`323`
`324`		`-nothrow unittest {`
	`324`	`+@safe nothrow unittest {`
`325`	`325`	`import std.conv;`
`326`	`326`
`327`	`327`	`HashMap!(string, string) map;`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ struct RCTable(T, Allocator = IAllocator) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`~this()`
`47`		`- {`
	`47`	`+ @trusted {`
`48`	`48`	`if (m_table.ptr && --this.refCount == 0) {`
`49`	`49`	`static if (hasIndirections!T) {`
`50`	`50`	`if (m_table.ptr !is null) () @trusted {`