fix more deprecations

Herringway · Sep 1, 2019 · 45a9b45 · 45a9b45
1 parent 1e8065a
commit 45a9b45
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 31 deletions.
diff --git a/source/virc/client.d b/source/virc/client.d
@@ -988,7 +988,7 @@ struct IRCClient(alias mix, T) if (isOutputRange!(T, char)) {
 		endAuthentication();
 	}
 	private void rec(string cmd : Numeric.RPL_MYINFO)(IRCMessage message, const MessageMetadata metadata) {
-		server.myInfo = parseNumeric!(Numeric.RPL_MYINFO)(message.args);
+		server.myInfo = parseNumeric!(Numeric.RPL_MYINFO)(message.args).get;
 	}
 	private void rec(string cmd : Numeric.RPL_LUSERCLIENT)(IRCMessage message, const MessageMetadata metadata) {
 		tryCall!"onLUserClient"(parseNumeric!(Numeric.RPL_LUSERCLIENT)(message.args), metadata);
@@ -1731,7 +1731,7 @@ version(unittest) {
 
 		client.put(":localhost 734 someone 5 Earl :Monitor list is full.");
 		assert(metadata.length == 1);
-		assert(metadata[0].messageNumeric == Numeric.ERR_MONLISTFULL);
+		assert(metadata[0].messageNumeric.get == Numeric.ERR_MONLISTFULL);
 	}
 	{ //extended-join http://ircv3.net/specs/extensions/extended-join-3.1.html
 		auto client = spawnNoBufferClient();
@@ -2377,7 +2377,7 @@ version(unittest) {
 
 		assert(client.output.data.canFind("AUTHENTICATE amlsbGVzAGppbGxlcwBzZXNhbWU="));
 		assert(client.isAuthenticated == true);
-		assert(client.me.account == testUser.nickname);
+		assert(client.me.account.get == testUser.nickname);
 	}
 	{ //SASL 3.2 test
 		auto client = spawnNoBufferClient();
@@ -2390,7 +2390,7 @@ version(unittest) {
 
 		assert(client.output.data.canFind("AUTHENTICATE amlsbGVzAGppbGxlcwBzZXNhbWU="));
 		assert(client.isAuthenticated == true);
-		assert(client.me.account == testUser.nickname);
+		assert(client.me.account.get == testUser.nickname);
 	}
 	{ //SASL 3.2 test
 		auto client = spawnNoBufferClient();
@@ -2403,7 +2403,7 @@ version(unittest) {
 
 		assert(client.output.data.canFind("AUTHENTICATE +"));
 		assert(client.isAuthenticated == true);
-		assert(client.me.account == testUser.nickname);
+		assert(client.me.account.get == testUser.nickname);
 	}
 	{ //SASL 3.2 test (bogus)
 		auto client = spawnNoBufferClient();
@@ -2416,7 +2416,7 @@ version(unittest) {
 
 		assert(!client.output.data.canFind("AUTHENTICATE amlsbGVzAGppbGxlcwBzZXNhbWU="));
 		assert(client.isAuthenticated == false);
-		//assert(client.me.account.isNull);
+		//assert(client.me.account.get.isNull);
 	}
 	{ //SASL post-registration test
 		auto client = spawnNoBufferClient();
@@ -2654,10 +2654,10 @@ version(unittest) {
 			assert(username.get == "someUsername");
 			assert(hostname.get == "someHostname");
 			assert(realname.get == "Some Real Name");
-			assert(connectedTime == SysTime(DateTime(2017, 7, 14, 2, 40, 0), UTC()));
-			assert(idleTime == 1000.seconds);
-			assert(connectedTo == "example.net");
-			assert(account == "someoneElseAccount");
+			assert(connectedTime.get == SysTime(DateTime(2017, 7, 14, 2, 40, 0), UTC()));
+			assert(idleTime.get == 1000.seconds);
+			assert(connectedTo.get == "example.net");
+			assert(account.get == "someoneElseAccount");
 			assert(channels.length == 2);
 			assert("#test" in channels);
 			assert(channels["#test"].prefix == "+");

diff --git a/source/virc/internaladdresslist.d b/source/virc/internaladdresslist.d
@@ -14,10 +14,10 @@ struct InternalAddressList {
 			users[user.nickname] = user;
 		} else {
 			if (!user.account.isNull) {
-				users[user.nickname].account = user.account;
+				users[user.nickname].account = user.account.get;
 			}
 			if (!user.realName.isNull) {
-				users[user.nickname].realName = user.realName;
+				users[user.nickname].realName = user.realName.get;
 			}
 			if (!user.mask.ident.isNull) {
 				users[user.nickname].mask.ident = user.mask.ident;
@@ -78,8 +78,8 @@ struct InternalAddressList {
 	testUser.realName = "Von Testington";
 	test.update(testUser);
 	assert(test["Test"] == User("Test!testo2@testy2"));
-	assert(test["Test"].account == "Testly");
-	assert(test["Test"].realName == "Von Testington");
+	assert(test["Test"].account.get == "Testly");
+	assert(test["Test"].realName.get == "Von Testington");
 	test.update(User("Test"));
 	assert(test["Test"] == User("Test!testo2@testy2"));
 

diff --git a/source/virc/ircv3/tags.d b/source/virc/ircv3/tags.d
@@ -140,7 +140,7 @@ auto arrayTag(string tag, string delimiter = ",", Type = string[])(IRCTags tags)
 ///
 @safe pure nothrow unittest {
 	assert(IRCTags(string[string].init).arrayTag!("test").isNull);
-	assert(IRCTags(["test":""]).arrayTag!("test").empty);
+	assert(IRCTags(["test":""]).arrayTag!("test").get.empty);
 	assert(IRCTags(["test":"a"]).arrayTag!("test").get.front == "a");
 	assert(IRCTags(["test":"a,b"]).arrayTag!("test") == ["a", "b"]);
 	assert(IRCTags(["test":"a:b"]).arrayTag!("test", ":") == ["a", "b"]);

diff --git a/source/virc/numerics/magicparser.d b/source/virc/numerics/magicparser.d
@@ -100,7 +100,7 @@ template MostCommon(Types...) {
 				Nullable!FinalType output;
 				static foreach(SubType; HasMemberTypes) {
 					if (!__traits(getMember, this, SubType.stringof.toLower()).isNull) {
-						output = __traits(getMember, __traits(getMember, this, SubType.stringof.toLower()), member);
+						output = __traits(getMember, __traits(getMember, this, SubType.stringof.toLower()).get, member);
 					}
 				}
 				return output;

diff --git a/source/virc/numerics/rfc1459.d b/source/virc/numerics/rfc1459.d
@@ -828,7 +828,7 @@ auto parseNumeric(Numeric numeric : Numeric.RPL_WHOISCHANNELS, T)(T input, strin
 			if (parsedChannel.isChannel) {
 				auto channel = WhoisChannelReplyChannel();
 				channel.prefix = parsedChannel.prefixes;
-				channel.channel = parsedChannel.channel;
+				channel.channel = parsedChannel.channel.get;
 				output.get.channels ~= channel;
 			}
 		}

diff --git a/source/virc/numerics/sasl.d b/source/virc/numerics/sasl.d
@@ -150,8 +150,8 @@ auto parseNumeric(Numeric numeric : Numeric.RPL_SASLMECHS, T)(T input) {
 	import std.range : only, takeNone;
 	{
 		auto logon = parseNumeric!(Numeric.RPL_SASLMECHS)(only("test", "EXTERNAL,PLAIN", "Well hello there"));
-		assert(logon.canFind("EXTERNAL"));
-		assert(logon.canFind("PLAIN"));
+		assert(logon.get.canFind("EXTERNAL"));
+		assert(logon.get.canFind("PLAIN"));
 	}
 	{
 		immutable logon = parseNumeric!(Numeric.RPL_SASLMECHS)(takeNone(only("")));

diff --git a/source/virc/usermask.d b/source/virc/usermask.d
@@ -41,12 +41,12 @@ struct UserMask {
 		put(sink, nickname);
 		if (!ident.isNull) {
 			put(sink, '!');
-			put(sink, ident);
+			put(sink, ident.get);
 			assert(!host.isNull);
 		}
 		if (!host.isNull) {
 			put(sink, '@');
-			put(sink, host);
+			put(sink, host.get);
 		}
 	}
 	auto toHash() const {
@@ -69,33 +69,33 @@ struct UserMask {
 	}
 	with (UserMask("user!id@example.net")) {
 		assert(nickname == "user");
-		assert(ident == "id");
-		assert(host == "example.net");
+		assert(ident.get == "id");
+		assert(host.get == "example.net");
 	}
 	with (UserMask("user!id@example!!!.net")) {
 		assert(nickname == "user");
-		assert(ident == "id");
-		assert(host == "example!!!.net");
+		assert(ident.get == "id");
+		assert(host.get == "example!!!.net");
 	}
 	with (UserMask("user!id@ex@mple!!!.net")) {
 		assert(nickname == "user");
-		assert(ident == "id");
-		assert(host == "ex@mple!!!.net");
+		assert(ident.get == "id");
+		assert(host.get == "ex@mple!!!.net");
 	}
 	with (UserMask("user!id!@ex@mple!!!.net")) {
 		assert(nickname == "user");
-		assert(ident == "id!");
-		assert(host == "ex@mple!!!.net");
+		assert(ident.get == "id!");
+		assert(host.get == "ex@mple!!!.net");
 	}
 	with (UserMask("user!id")) {
 		assert(nickname == "user");
-		assert(ident == "id");
+		assert(ident.get == "id");
 		assert(host.isNull);
 	}
 	with (UserMask("user@example.net")) {
 		assert(nickname == "user");
 		assert(ident.isNull);
-		assert(host == "example.net");
+		assert(host.get == "example.net");
 	}
 }
 @safe pure unittest {