From 3b44ea0fd919df020d2195d2b90aa65b6e70ada4 Mon Sep 17 00:00:00 2001 From: dvkt Date: Fri, 27 Dec 2019 18:47:56 -0800 Subject: [PATCH] default selector is empty, not / --- src/gopher.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gopher.rs b/src/gopher.rs index e593eae..1b090d0 100644 --- a/src/gopher.rs +++ b/src/gopher.rs @@ -184,7 +184,7 @@ pub fn parse_url(url: &str) -> (Type, &str, &str, &str) { // simple URLs, ex: "dog.com" if !url.contains(':') && !url.contains('/') { - return (Type::Menu, url, "70", "/"); + return (Type::Menu, url, "70", ""); } // non-gopher URLs, stick everything in selector @@ -195,7 +195,7 @@ pub fn parse_url(url: &str) -> (Type, &str, &str, &str) { let mut typ = Type::Menu; let mut host; let mut port = "70"; - let mut sel = "/"; + let mut sel = ""; // check selector first if let Some(idx) = url.find('/') { @@ -277,7 +277,7 @@ mod tests { assert_eq!(typ, Type::Menu); assert_eq!(host, "gopher.floodgap.org"); assert_eq!(port, "70"); - assert_eq!(sel, "/"); + assert_eq!(sel, ""); let (typ, host, port, sel) = parse_url(urls[3]); assert_eq!(typ, Type::Text); @@ -295,7 +295,7 @@ mod tests { assert_eq!(typ, Type::Menu); assert_eq!(host, "dead:beef:1234:5678:9012:3456:feed:deed"); assert_eq!(port, "70"); - assert_eq!(sel, "/"); + assert_eq!(sel, ""); let (typ, host, port, sel) = parse_url(urls[6]); assert_eq!(typ, Type::Menu); @@ -307,19 +307,19 @@ mod tests { assert_eq!(typ, Type::Menu); assert_eq!(host, "2001:cdba:0000:0000:0000:0000:3257:9121"); assert_eq!(port, "70"); - assert_eq!(sel, "/"); + assert_eq!(sel, ""); let (typ, host, port, sel) = parse_url(urls[8]); assert_eq!(typ, Type::Menu); assert_eq!(host, "2001:cdba::3257:9652"); assert_eq!(port, "70"); - assert_eq!(sel, "/"); + assert_eq!(sel, ""); let (typ, host, port, sel) = parse_url(urls[9]); assert_eq!(typ, Type::Menu); assert_eq!(host, "9999:aaaa::abab:baba:aaaa:9999"); assert_eq!(port, "70"); - assert_eq!(sel, "/"); + assert_eq!(sel, ""); let (typ, host, port, sel) = parse_url(urls[10]); assert_eq!(typ, Type::Error); @@ -331,7 +331,7 @@ mod tests { assert_eq!(typ, Type::Menu); assert_eq!(host, "::1"); assert_eq!(port, "70"); - assert_eq!(sel, "/"); + assert_eq!(sel, ""); let (typ, host, port, sel) = parse_url(urls[12]); assert_eq!(typ, Type::HTML);