This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Use relative path for IPC sockets #1983
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
| @@ -167,10 +168,13 @@ impl IoHandler<ClientIoMessage> for ClientIoHandler { | |||
| } | |||
|
|
|||
| #[cfg(feature="ipc")] | |||
| fn run_ipc(client: Arc<Client>, stop: Arc<AtomicBool>) { | |||
| fn run_ipc(base_path: &Path, client: Arc<Client>, stop: Arc<AtomicBool>) { | |||
| let mut path = ::std::path::PathBuf::from(base_path); | |||
| pub fn hypervisor(base_path: &Path) -> Option<Hypervisor> { | ||
| Some(Hypervisor | ||
| ::with_url(&service_urls::with_base(base_path.to_str().unwrap(), HYPERVISOR_IPC_URL)) | ||
| .io_path(base_path.to_str().unwrap())) |
There was a problem hiding this comment.
to_string_lossy() here too?
There was a problem hiding this comment.
nope, it returns Cow
There was a problem hiding this comment.
io_path takes an &str and Cow<str> implements Deref<Target=str> so it should work if you just slap a &* on the front
rphmeier
added
A8-looksgood 🦄
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Probably also related #1978