chore: replace url with http::uri::Uri #6
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vrongmeal
reviewed
Sep 13, 2024
src/client.rs
Outdated
| match self.config.url.cell.clone() { | ||
| Some(uri) if self.config.url.prefix_host_with_basin => { | ||
| let host = uri.host().ok_or(ClientError::MissingHost)?; | ||
| let authority: Authority = format!("{basin}.{host}").parse()?; |
There was a problem hiding this comment.
Let's also append the port (if any)?
Suggested change
| let authority: Authority = format!("{basin}.{host}").parse()?; | |
| let port = if let Some(port) = uri.port_u16() { | |
| format!(":{port}") | |
| } else { | |
| String::new() | |
| }; | |
| let authority: Authority = format!("{basin}.{host}{port}").parse()?; |
Or something cleaner than this.
There was a problem hiding this comment.
The reason I used url before was so we can set_host without changing other parameters, but I think it's OK for us to ignore the username:password section of the URI
src/client.rs
Outdated
| // TODO: Connection pool? | ||
| let endpoint: Endpoint = url.as_str().parse()?; | ||
| let endpoint: Endpoint = uri.to_string().parse()?; |
vrongmeal
approved these changes
Sep 13, 2024
src/client.rs
Outdated
| Some(uri) if self.config.url.prefix_host_with_basin => { | ||
| let host = uri.host().ok_or(ClientError::MissingHost)?; | ||
| let port = uri.port_u16().map_or(String::new(), |p| p.to_string()); | ||
| let authority: Authority = format!("{basin}.{host}:{port}").parse()?; |
There was a problem hiding this comment.
If the port is an empty string will it parse correctly?
basin.s2.dev: doesn't seem like a valid authority.
There was a problem hiding this comment.
oh i am sorry, i forgot to push again
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.