mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 14:32:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

all: automatic error propagation in place of "or { return(err) }"

Browse source
This commit is contained in:
Maciej Obarski 2020-08-29 01:58:03 +02:00 • committed by GitHub
parent 4d425b0e6d
commit 7bd2804ce9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 79 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

52
vlib/net/urllib/urllib.v
View file

@ -479,9 +479,7 @@ fn parse_url(rawurl string, via_request bool) ?URL {
}
// Split off possible leading 'http:', 'mailto:', etc.
// Cannot contain escaped characters.
p := split_by_scheme(rawurl) or {
return error(err)
}
p := split_by_scheme(rawurl)?
url.scheme = p[0]
mut rest := p[1]
url.scheme = url.scheme.to_lower()
@ -524,9 +522,7 @@ fn parse_url(rawurl string, via_request bool) ?URL {
if ((url.scheme != '' || !via_request) && !rest.starts_with('///')) && rest.starts_with('//') {
authority,r := split(rest[2..], `/`, false)
rest = r
a := parse_authority(authority) or {
return error(err)
}
a := parse_authority(authority)?
url.user = a.user
url.host = a.host
}
@ -534,9 +530,7 @@ fn parse_url(rawurl string, via_request bool) ?URL {
// raw_path is a hint of the encoding of path. We don't want to set it if
// the default escaping of path is equivalent, to help make sure that people
// don't rely on it in general.
url.set_path(rest) or {
return error(err)
}
url.set_path(rest)?
return url
}
@ -552,15 +546,11 @@ fn parse_authority(authority string) ?ParseAuthorityRes {
mut host := ''
mut zuser := user('')
if i < 0 {
h := parse_host(authority) or {
return error(err)
}
h := parse_host(authority)?
host = h
}
else {
h := parse_host(authority[i + 1..]) or {
return error(err)
}
h := parse_host(authority[i + 1..])?
host = h
}
if i < 0 {
@ -574,21 +564,15 @@ fn parse_authority(authority string) ?ParseAuthorityRes {
return error(error_msg('parse_authority: invalid userinfo', ''))
}
if !userinfo.contains(':') {
u := unescape(userinfo, .encode_user_password) or {
return error(err)
}
u := unescape(userinfo, .encode_user_password)?
userinfo = u
zuser = user(userinfo)
}
else {
mut username,mut password := split(userinfo, `:`, true)
u := unescape(username, .encode_user_password) or {
return error(err)
}
u := unescape(username, .encode_user_password)?
username = u
p := unescape(password, .encode_user_password) or {
return error(err)
}
p := unescape(password, .encode_user_password)?
password = p
zuser = user_password(username, password)
}
@ -652,9 +636,7 @@ fn parse_host(host string) ?string {
// set_path will return an error only if the provided path contains an invalid
// escaping.
pub fn (mut u URL) set_path(p string) ?bool {
path := unescape(p, .encode_path) or {
return error(err)
}
path := unescape(p, .encode_path)?
u.path = path
escp := escape(path, .encode_path)
if p == escp {
@ -822,9 +804,7 @@ pub fn (u URL) str() string {
// interpreted as a key set to an empty value.
pub fn parse_query(query string) ?Values {
mut m := new_values()
parse_query_values(mut m, query) or {
return error(err)
}
parse_query_values(mut m, query)?
return m
}
@ -956,9 +936,7 @@ pub fn (u &URL) is_abs() bool {
// may be relative or absolute. parse returns nil, err on parse
// failure, otherwise its return value is the same as resolve_reference.
pub fn (u &URL) parse(ref string) ?URL {
refurl := parse(ref) or {
return error(err)
}
refurl := parse(ref)?
return u.resolve_reference(refurl)
}
@ -977,9 +955,7 @@ pub fn (u &URL) resolve_reference(ref &URL) ?URL {
// The 'absoluteURI' or 'net_path' cases.
// We can ignore the error from set_path since we know we provided a
// validly-escaped path.
url.set_path(resolve_path(ref.escaped_path(), '')) or {
return error(err)
}
url.set_path(resolve_path(ref.escaped_path(), ''))?
return url
}
if ref.opaque != '' {
@ -997,9 +973,7 @@ pub fn (u &URL) resolve_reference(ref &URL) ?URL {
// The 'abs_path' or 'rel_path' cases.
url.host = u.host
url.user = u.user
url.set_path(resolve_path(u.escaped_path(), ref.escaped_path())) or {
return error(err)
}
url.set_path(resolve_path(u.escaped_path(), ref.escaped_path()))?
return url
}