Skip to content

inets: change uri_string:uri_string() type to string() where needed #10242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: maint
Choose a base branch
from
Open

inets: change uri_string:uri_string() type to string() where needed #10242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions lib/inets/src/http_client/httpc.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ profile_name(_Prefix, Profile) when is_pid(Profile) ->
, HttpBodyResult}
| RequestId
| saved_to_file,
HttpBodyResult :: uri_string:uri_string() | binary(),
HttpVersion :: uri_string:uri_string(),
HttpBodyResult :: string() | binary(),
HttpVersion :: string(),
StatusCode :: non_neg_integer(),
HttpHeader :: { Field :: [byte()]
, Value :: binary() | iolist()},
Expand All @@ -174,11 +174,11 @@ request(Url) ->
| saved_to_file,
HttpHeader :: { Field :: [byte()]
, Value :: binary() | iolist()},
HttpBodyResult :: uri_string:uri_string() | binary(),
HttpBodyResult :: string() | binary(),
StatusLine :: { HttpVersion
, StatusCode
, string()},
HttpVersion :: uri_string:uri_string(),
HttpVersion :: string(),
StatusCode :: non_neg_integer(),
RequestId :: any().
request(Url, Profile) ->
Expand All @@ -198,7 +198,7 @@ request(Url, Profile) ->
, [HttpHeader] }
| { uri_string:uri_string()
, [ HttpHeader ]
, ContentType::uri_string:uri_string()
, ContentType::string()
, HttpBody},
HttpBody :: iolist()
| binary()
Expand Down Expand Up @@ -240,10 +240,10 @@ request(Url, Profile) ->
StatusLine :: { HttpVersion
, StatusCode
, string()},
HttpVersion :: uri_string:uri_string(),
HttpVersion :: string(),
HttpHeader :: { Field :: [byte()]
, Value :: binary() | iolist()},
HttpBodyResult :: uri_string:uri_string() | binary(),
HttpBodyResult :: string() | binary(),
RequestId :: any().
request(Method, Request, HttpOptions, Options) ->
request(Method, Request, HttpOptions, Options, default_profile()).
Expand Down Expand Up @@ -412,7 +412,7 @@ Options details:
, [HttpHeader] }
| { uri_string:uri_string()
, [ HttpHeader ]
, ContentType::uri_string:uri_string()
, ContentType::string()
, HttpBody},
HttpBody :: iolist()
| binary()
Expand Down Expand Up @@ -449,7 +449,7 @@ Options details:
, ReceiverFunction::atom()
, ReceiverArgs::list()},
Profile :: atom() | pid(),
HttpVersion :: uri_string:uri_string(),
HttpVersion :: string(),
Result :: {StatusLine
, [HttpHeader]
, HttpBodyResult}
Expand All @@ -459,7 +459,7 @@ Options details:
| saved_to_file,
StatusLine :: { HttpVersion, StatusCode, string()},
StatusCode :: non_neg_integer(),
HttpBodyResult :: uri_string:uri_string() | binary(),
HttpBodyResult :: string() | binary(),
RequestId :: any().
request(Method, Request, HTTPOptions, Options, Profile)
when is_atom(Profile) orelse is_pid(Profile) ->
Expand Down Expand Up @@ -565,15 +565,15 @@ cancel_request(RequestId, Profile)
PipelineTimeout :: integer(),
CookieMode :: enabled | disabled | verify,
IpFamily :: inet | inet6 | local | inet6fb4,
IpAddressDesc :: uri_string:uri_string(),
IpAddressDesc :: string(),
IpAddress :: inet:ip_address(),
VerboseMode :: false | verbose | debug | trace,
SocketOpts :: [SocketOpt],
SocketOpt :: term(),
UnixSocket :: file:name_all(),
Reason :: term(),
DomainDesc :: string(),
HostName :: uri_string:uri_string().
HostName :: string().
set_options(Options) ->
set_options(Options, default_profile()).

Expand Down Expand Up @@ -689,13 +689,13 @@ Sets options to be used for subsequent requests.
PipelineTimeout :: integer(),
CookieMode :: enabled | disabled | verify,
IpFamily :: inet | inet6 | local | inet6fb4,
IpAddressDesc :: uri_string:uri_string(),
IpAddressDesc :: string(),
IpAddress :: inet:ip_address(),
VerboseMode :: false | verbose | debug | trace,
UnixSocket :: string(),
Reason :: term(),
DomainDesc :: string(),
HostName :: uri_string:uri_string().
HostName :: string().
set_options(Options, Profile) when is_atom(Profile) orelse is_pid(Profile) ->
case validate_options(Options) of
{ok, Opts} ->
Expand Down
Loading