From 4a20642865898b30359e785745ffdd69be22cb64 Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Fri, 23 Jun 2023 11:23:25 +0200 Subject: [PATCH] rename to corcovado --- Cargo.lock | 44 +++++----- Cargo.toml | 2 +- {urca => corcovado}/Cargo.toml | 2 +- {urca => corcovado}/ORIGINAL_LICENSE | 0 corcovado/README.md | 3 + {urca => corcovado}/benches/bench_poll.rs | 4 +- {urca => corcovado}/src/channel.rs | 0 {urca => corcovado}/src/event_imp.rs | 82 +++++++++---------- {urca => corcovado}/src/io.rs | 0 {urca => corcovado}/src/lazycell.rs | 0 {urca => corcovado}/src/lib.rs | 4 +- {urca => corcovado}/src/poll.rs | 54 ++++++------ .../src/sys/fuchsia/awakener.rs | 0 .../src/sys/fuchsia/eventedfd.rs | 0 .../src/sys/fuchsia/handles.rs | 0 {urca => corcovado}/src/sys/fuchsia/mod.rs | 0 {urca => corcovado}/src/sys/fuchsia/net.rs | 0 {urca => corcovado}/src/sys/fuchsia/ready.rs | 0 .../src/sys/fuchsia/selector.rs | 0 {urca => corcovado}/src/sys/mod.rs | 0 {urca => corcovado}/src/sys/unix/awakener.rs | 0 {urca => corcovado}/src/sys/unix/dlsym.rs | 0 {urca => corcovado}/src/sys/unix/epoll.rs | 0 {urca => corcovado}/src/sys/unix/eventedfd.rs | 10 +-- {urca => corcovado}/src/sys/unix/io.rs | 0 {urca => corcovado}/src/sys/unix/kqueue.rs | 0 {urca => corcovado}/src/sys/unix/mod.rs | 0 {urca => corcovado}/src/sys/unix/ready.rs | 34 ++++---- {urca => corcovado}/src/sys/unix/tcp.rs | 0 {urca => corcovado}/src/sys/unix/udp.rs | 0 {urca => corcovado}/src/sys/unix/uds.rs | 0 {urca => corcovado}/src/sys/unix/uio.rs | 0 .../src/sys/windows/awakener.rs | 0 .../src/sys/windows/buffer_pool.rs | 0 .../src/sys/windows/from_raw_arc.rs | 0 {urca => corcovado}/src/sys/windows/mod.rs | 0 .../src/sys/windows/selector.rs | 0 {urca => corcovado}/src/sys/windows/tcp.rs | 0 {urca => corcovado}/src/sys/windows/udp.rs | 0 {urca => corcovado}/src/timer.rs | 2 +- {urca => corcovado}/src/token.rs | 4 +- {urca => corcovado}/test/benchmark.rs | 4 +- {urca => corcovado}/test/mod.rs | 6 +- {urca => corcovado}/test/test_broken_pipe.rs | 4 +- .../test/test_close_on_drop.rs | 4 +- .../test/test_custom_evented.rs | 8 +- .../test/test_double_register.rs | 4 +- {urca => corcovado}/test/test_echo_server.rs | 4 +- .../test/test_fuchsia_handles.rs | 4 +- .../test/test_local_addr_ready.rs | 4 +- {urca => corcovado}/test/test_multicast.rs | 2 +- {urca => corcovado}/test/test_oneshot.rs | 2 +- {urca => corcovado}/test/test_poll.rs | 2 +- .../test/test_register_deregister.rs | 6 +- .../test_register_multiple_event_loops.rs | 4 +- .../test/test_reregister_without_poll.rs | 4 +- {urca => corcovado}/test/test_smoke.rs | 6 +- {urca => corcovado}/test/test_tcp.rs | 4 +- {urca => corcovado}/test/test_tcp_level.rs | 6 +- {urca => corcovado}/test/test_tcp_shutdown.rs | 10 +-- {urca => corcovado}/test/test_udp_level.rs | 6 +- {urca => corcovado}/test/test_udp_socket.rs | 4 +- .../test/test_write_then_drop.rs | 6 +- rio/Cargo.toml | 2 +- rio/src/performer/mod.rs | 12 +-- rio/src/screen/messenger.rs | 4 +- teletypewriter/Cargo.toml | 2 +- teletypewriter/src/lib.rs | 22 ++--- teletypewriter/src/unix/mod.rs | 40 ++++----- teletypewriter/src/unix/signals.rs | 6 +- teletypewriter/src/unix/stream.rs | 6 +- urca/README.md | 3 - 72 files changed, 223 insertions(+), 223 deletions(-) rename {urca => corcovado}/Cargo.toml (97%) rename {urca => corcovado}/ORIGINAL_LICENSE (100%) create mode 100644 corcovado/README.md rename {urca => corcovado}/benches/bench_poll.rs (96%) rename {urca => corcovado}/src/channel.rs (100%) rename {urca => corcovado}/src/event_imp.rs (95%) rename {urca => corcovado}/src/io.rs (100%) rename {urca => corcovado}/src/lazycell.rs (100%) rename {urca => corcovado}/src/lib.rs (99%) rename {urca => corcovado}/src/poll.rs (98%) rename {urca => corcovado}/src/sys/fuchsia/awakener.rs (100%) rename {urca => corcovado}/src/sys/fuchsia/eventedfd.rs (100%) rename {urca => corcovado}/src/sys/fuchsia/handles.rs (100%) rename {urca => corcovado}/src/sys/fuchsia/mod.rs (100%) rename {urca => corcovado}/src/sys/fuchsia/net.rs (100%) rename {urca => corcovado}/src/sys/fuchsia/ready.rs (100%) rename {urca => corcovado}/src/sys/fuchsia/selector.rs (100%) rename {urca => corcovado}/src/sys/mod.rs (100%) rename {urca => corcovado}/src/sys/unix/awakener.rs (100%) rename {urca => corcovado}/src/sys/unix/dlsym.rs (100%) rename {urca => corcovado}/src/sys/unix/epoll.rs (100%) rename {urca => corcovado}/src/sys/unix/eventedfd.rs (93%) rename {urca => corcovado}/src/sys/unix/io.rs (100%) rename {urca => corcovado}/src/sys/unix/kqueue.rs (100%) rename {urca => corcovado}/src/sys/unix/mod.rs (100%) rename {urca => corcovado}/src/sys/unix/ready.rs (95%) rename {urca => corcovado}/src/sys/unix/tcp.rs (100%) rename {urca => corcovado}/src/sys/unix/udp.rs (100%) rename {urca => corcovado}/src/sys/unix/uds.rs (100%) rename {urca => corcovado}/src/sys/unix/uio.rs (100%) rename {urca => corcovado}/src/sys/windows/awakener.rs (100%) rename {urca => corcovado}/src/sys/windows/buffer_pool.rs (100%) rename {urca => corcovado}/src/sys/windows/from_raw_arc.rs (100%) rename {urca => corcovado}/src/sys/windows/mod.rs (100%) rename {urca => corcovado}/src/sys/windows/selector.rs (100%) rename {urca => corcovado}/src/sys/windows/tcp.rs (100%) rename {urca => corcovado}/src/sys/windows/udp.rs (100%) rename {urca => corcovado}/src/timer.rs (99%) rename {urca => corcovado}/src/token.rs (98%) rename {urca => corcovado}/test/benchmark.rs (94%) rename {urca => corcovado}/test/mod.rs (98%) rename {urca => corcovado}/test/test_broken_pipe.rs (88%) rename {urca => corcovado}/test/test_close_on_drop.rs (97%) rename {urca => corcovado}/test/test_custom_evented.rs (98%) rename {urca => corcovado}/test/test_double_register.rs (89%) rename {urca => corcovado}/test/test_echo_server.rs (99%) rename {urca => corcovado}/test/test_fuchsia_handles.rs (94%) rename {urca => corcovado}/test/test_local_addr_ready.rs (95%) rename {urca => corcovado}/test/test_multicast.rs (98%) rename {urca => corcovado}/test/test_oneshot.rs (99%) rename {urca => corcovado}/test/test_poll.rs (96%) rename {urca => corcovado}/test/test_register_deregister.rs (96%) rename {urca => corcovado}/test/test_register_multiple_event_loops.rs (97%) rename {urca => corcovado}/test/test_reregister_without_poll.rs (93%) rename {urca => corcovado}/test/test_smoke.rs (86%) rename {urca => corcovado}/test/test_tcp.rs (99%) rename {urca => corcovado}/test/test_tcp_level.rs (97%) rename {urca => corcovado}/test/test_tcp_shutdown.rs (97%) rename {urca => corcovado}/test/test_udp_level.rs (94%) rename {urca => corcovado}/test/test_udp_socket.rs (98%) rename {urca => corcovado}/test/test_write_then_drop.rs (95%) delete mode 100644 urca/README.md diff --git a/Cargo.lock b/Cargo.lock index 83e48bd4..0d9cb0a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -484,6 +484,26 @@ dependencies = [ "x11-clipboard", ] +[[package]] +name = "corcovado" +version = "0.0.1" +dependencies = [ + "bytes 0.3.0", + "cfg-if 0.1.10", + "env_logger 0.4.3", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log 0.4.18", + "miow", + "net2", + "slab", + "tempdir", + "winapi 0.2.8", +] + [[package]] name = "core-foundation" version = "0.9.3" @@ -2092,6 +2112,7 @@ dependencies = [ "colors", "config", "copypasta", + "corcovado", "dirs", "glyph_brush", "image", @@ -2106,7 +2127,6 @@ dependencies = [ "teletypewriter", "tokio", "unicode-width", - "urca", "vte", "wayland-client", "wgpu", @@ -2404,12 +2424,12 @@ dependencies = [ name = "teletypewriter" version = "2.0.0" dependencies = [ + "corcovado", "dirs", "iovec", "libc", "miow", "signal-hook", - "urca", "windows-sys 0.48.0", ] @@ -2578,26 +2598,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "urca" -version = "0.0.1" -dependencies = [ - "bytes 0.3.0", - "cfg-if 0.1.10", - "env_logger 0.4.3", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log 0.4.18", - "miow", - "net2", - "slab", - "tempdir", - "winapi 0.2.8", -] - [[package]] name = "utf8parse" version = "0.2.1" diff --git a/Cargo.toml b/Cargo.toml index 3a71fb6a..4c52ddaa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = [ "webassembly-examples/*", "colors", "config", - "urca", + "corcovado", "rio" ] resolver = "2" diff --git a/urca/Cargo.toml b/corcovado/Cargo.toml similarity index 97% rename from urca/Cargo.toml rename to corcovado/Cargo.toml index ead2f4e4..49f9a430 100644 --- a/urca/Cargo.toml +++ b/corcovado/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "urca" +name = "corcovado" version = "0.0.1" license = "MIT" authors = ["Carl Lerche ", "Raphael Amorim Evented for ::std::sync::Arc { /// # Examples /// /// ``` -/// use urca::PollOpt; +/// use corcovado::PollOpt; /// /// let opts = PollOpt::edge() | PollOpt::oneshot(); /// @@ -275,7 +275,7 @@ impl PollOpt { /// # Examples /// /// ``` - /// use urca::PollOpt; + /// use corcovado::PollOpt; /// /// let opt = PollOpt::empty(); /// @@ -295,7 +295,7 @@ impl PollOpt { /// # Examples /// /// ``` - /// use urca::PollOpt; + /// use corcovado::PollOpt; /// /// let opt = PollOpt::edge(); /// @@ -315,7 +315,7 @@ impl PollOpt { /// # Examples /// /// ``` - /// use urca::PollOpt; + /// use corcovado::PollOpt; /// /// let opt = PollOpt::level(); /// @@ -335,7 +335,7 @@ impl PollOpt { /// # Examples /// /// ``` - /// use urca::PollOpt; + /// use corcovado::PollOpt; /// /// let opt = PollOpt::oneshot(); /// @@ -371,7 +371,7 @@ impl PollOpt { /// # Examples /// /// ``` - /// use urca::PollOpt; + /// use corcovado::PollOpt; /// /// let opt = PollOpt::edge(); /// @@ -391,7 +391,7 @@ impl PollOpt { /// # Examples /// /// ``` - /// use urca::PollOpt; + /// use corcovado::PollOpt; /// /// let opt = PollOpt::level(); /// @@ -411,7 +411,7 @@ impl PollOpt { /// # Examples /// /// ``` - /// use urca::PollOpt; + /// use corcovado::PollOpt; /// /// let opt = PollOpt::oneshot(); /// @@ -452,7 +452,7 @@ impl PollOpt { /// # Examples /// /// ``` - /// use urca::PollOpt; + /// use corcovado::PollOpt; /// /// let opt = PollOpt::oneshot(); /// @@ -461,7 +461,7 @@ impl PollOpt { /// ``` /// /// ``` - /// use urca::PollOpt; + /// use corcovado::PollOpt; /// /// let opt = PollOpt::oneshot() | PollOpt::edge(); /// @@ -470,7 +470,7 @@ impl PollOpt { /// ``` /// /// ``` - /// use urca::PollOpt; + /// use corcovado::PollOpt; /// /// let opt = PollOpt::oneshot() | PollOpt::edge(); /// @@ -492,7 +492,7 @@ impl PollOpt { /// # Examples /// /// ``` - /// use urca::PollOpt; + /// use corcovado::PollOpt; /// /// let mut opt = PollOpt::empty(); /// opt.insert(PollOpt::oneshot()); @@ -511,7 +511,7 @@ impl PollOpt { /// # Examples /// /// ``` - /// use urca::PollOpt; + /// use corcovado::PollOpt; /// /// let mut opt = PollOpt::oneshot(); /// opt.remove(PollOpt::oneshot()); @@ -627,7 +627,7 @@ fn test_debug_pollopt() { /// # Examples /// /// ``` -/// use urca::Ready; +/// use corcovado::Ready; /// /// let ready = Ready::readable() | Ready::writable(); /// @@ -657,7 +657,7 @@ impl Ready { /// # Examples /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let ready = Ready::empty(); /// @@ -683,7 +683,7 @@ impl Ready { /// # Examples /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let ready = Ready::readable(); /// @@ -703,7 +703,7 @@ impl Ready { /// # Examples /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let ready = Ready::writable(); /// @@ -742,7 +742,7 @@ impl Ready { /// # Examples /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let ready = Ready::all(); /// @@ -763,7 +763,7 @@ impl Ready { /// # Examples /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let ready = Ready::empty(); /// assert!(ready.is_empty()); @@ -790,7 +790,7 @@ impl Ready { /// # Examples /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let ready = Ready::readable(); /// @@ -810,7 +810,7 @@ impl Ready { /// # Examples /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let ready = Ready::writable(); /// @@ -846,7 +846,7 @@ impl Ready { /// # Examples /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let mut readiness = Ready::empty(); /// readiness.insert(Ready::readable()); @@ -866,7 +866,7 @@ impl Ready { /// # Examples /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let mut readiness = Ready::readable(); /// readiness.remove(Ready::readable()); @@ -898,7 +898,7 @@ impl Ready { /// # Examples /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let readiness = Ready::readable(); /// @@ -907,7 +907,7 @@ impl Ready { /// ``` /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let readiness = Ready::readable() | Ready::writable(); /// @@ -916,7 +916,7 @@ impl Ready { /// ``` /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let readiness = Ready::readable() | Ready::writable(); /// @@ -947,7 +947,7 @@ impl Ready { /// # Examples /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let ready = Ready::readable(); /// let ready_usize = ready.as_usize(); @@ -972,7 +972,7 @@ impl Ready { /// # Examples /// /// ``` - /// use urca::Ready; + /// use corcovado::Ready; /// /// let ready = Ready::readable(); /// let ready_usize = ready.as_usize(); @@ -1106,8 +1106,8 @@ fn test_debug_ready() { /// # Examples /// /// ``` -/// use urca::{Ready, Token}; -/// use urca::event::Event; +/// use corcovado::{Ready, Token}; +/// use corcovado::event::Event; /// /// let event = Event::new(Ready::readable() | Ready::writable(), Token(0)); /// @@ -1131,8 +1131,8 @@ impl Event { /// # Examples /// /// ``` - /// use urca::{Ready, Token}; - /// use urca::event::Event; + /// use corcovado::{Ready, Token}; + /// use corcovado::event::Event; /// /// let event = Event::new(Ready::readable() | Ready::writable(), Token(0)); /// @@ -1151,8 +1151,8 @@ impl Event { /// # Examples /// /// ``` - /// use urca::{Ready, Token}; - /// use urca::event::Event; + /// use corcovado::{Ready, Token}; + /// use corcovado::event::Event; /// /// let event = Event::new(Ready::readable() | Ready::writable(), Token(0)); /// @@ -1174,8 +1174,8 @@ impl Event { /// # Examples /// /// ``` - /// use urca::{Ready, Token}; - /// use urca::event::Event; + /// use corcovado::{Ready, Token}; + /// use corcovado::event::Event; /// /// let event = Event::new(Ready::readable() | Ready::writable(), Token(0)); /// diff --git a/urca/src/io.rs b/corcovado/src/io.rs similarity index 100% rename from urca/src/io.rs rename to corcovado/src/io.rs diff --git a/urca/src/lazycell.rs b/corcovado/src/lazycell.rs similarity index 100% rename from urca/src/lazycell.rs rename to corcovado/src/lazycell.rs diff --git a/urca/src/lib.rs b/corcovado/src/lib.rs similarity index 99% rename from urca/src/lib.rs rename to corcovado/src/lib.rs index e065c46b..cc1921fc 100644 --- a/urca/src/lib.rs +++ b/corcovado/src/lib.rs @@ -45,8 +45,8 @@ //! # Example //! //! ``` -//! use urca::*; -//! use urca::net::{TcpListener, TcpStream}; +//! use corcovado::*; +//! use corcovado::net::{TcpListener, TcpStream}; //! //! // Setup some tokens to allow us to identify which event is //! // for which socket. diff --git a/urca/src/poll.rs b/corcovado/src/poll.rs similarity index 98% rename from urca/src/poll.rs rename to corcovado/src/poll.rs index ffc77be5..86e82a4b 100644 --- a/urca/src/poll.rs +++ b/corcovado/src/poll.rs @@ -89,8 +89,8 @@ use {sys, Token}; /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { -/// use urca::{Events, Poll, Ready, PollOpt, Token}; -/// use urca::net::TcpStream; +/// use corcovado::{Events, Poll, Ready, PollOpt, Token}; +/// use corcovado::net::TcpStream; /// /// use std::net::{TcpListener, SocketAddr}; /// @@ -266,8 +266,8 @@ use {sys, Token}; /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { -/// use urca::{Poll, Ready, PollOpt, Token}; -/// use urca::net::TcpStream; +/// use corcovado::{Poll, Ready, PollOpt, Token}; +/// use corcovado::net::TcpStream; /// use std::time::Duration; /// use std::thread; /// @@ -372,8 +372,8 @@ pub struct Poll { /// # Examples /// /// ``` -/// use urca::{Ready, Registration, Poll, PollOpt, Token}; -/// use urca::event::Evented; +/// use corcovado::{Ready, Registration, Poll, PollOpt, Token}; +/// use corcovado::event::Evented; /// /// use std::io; /// use std::time::Instant; @@ -626,7 +626,7 @@ impl Poll { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { - /// use urca::{Poll, Events}; + /// use corcovado::{Poll, Events}; /// use std::time::Duration; /// /// let poll = match Poll::new() { @@ -739,8 +739,8 @@ impl Poll { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { - /// use urca::{Events, Poll, Ready, PollOpt, Token}; - /// use urca::net::TcpStream; + /// use corcovado::{Events, Poll, Ready, PollOpt, Token}; + /// use corcovado::net::TcpStream; /// use std::time::{Duration, Instant}; /// /// let poll = Poll::new()?; @@ -831,8 +831,8 @@ impl Poll { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { - /// use urca::{Poll, Ready, PollOpt, Token}; - /// use urca::net::TcpStream; + /// use corcovado::{Poll, Ready, PollOpt, Token}; + /// use corcovado::net::TcpStream; /// /// let poll = Poll::new()?; /// let socket = TcpStream::connect(&"216.58.193.100:80".parse()?)?; @@ -895,8 +895,8 @@ impl Poll { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { - /// use urca::{Events, Poll, Ready, PollOpt, Token}; - /// use urca::net::TcpStream; + /// use corcovado::{Events, Poll, Ready, PollOpt, Token}; + /// use corcovado::net::TcpStream; /// use std::time::Duration; /// /// let poll = Poll::new()?; @@ -977,8 +977,8 @@ impl Poll { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { - /// use urca::{Events, Poll, Ready, PollOpt, Token}; - /// use urca::net::TcpStream; + /// use corcovado::{Events, Poll, Ready, PollOpt, Token}; + /// use corcovado::net::TcpStream; /// /// use std::net::{TcpListener, SocketAddr}; /// use std::thread; @@ -1278,7 +1278,7 @@ impl AsRawFd for Poll { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { -/// use urca::{Events, Poll}; +/// use corcovado::{Events, Poll}; /// use std::time::Duration; /// /// let mut events = Events::with_capacity(1024); @@ -1316,7 +1316,7 @@ pub struct Events { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { -/// use urca::{Events, Poll}; +/// use corcovado::{Events, Poll}; /// use std::time::Duration; /// /// let mut events = Events::with_capacity(1024); @@ -1354,7 +1354,7 @@ pub struct Iter<'a> { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { -/// use urca::{Events, Poll}; +/// use corcovado::{Events, Poll}; /// use std::time::Duration; /// /// let mut events = Events::with_capacity(1024); @@ -1387,7 +1387,7 @@ impl Events { /// # Examples /// /// ``` - /// use urca::Events; + /// use corcovado::Events; /// /// let events = Events::with_capacity(1024); /// @@ -1420,7 +1420,7 @@ impl Events { /// Returns the number of `Event` values that `self` can hold. /// /// ``` - /// use urca::Events; + /// use corcovado::Events; /// /// let events = Events::with_capacity(1024); /// @@ -1435,7 +1435,7 @@ impl Events { /// # Examples /// /// ``` - /// use urca::Events; + /// use corcovado::Events; /// /// let events = Events::with_capacity(1024); /// @@ -1452,7 +1452,7 @@ impl Events { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { - /// use urca::{Events, Poll}; + /// use corcovado::{Events, Poll}; /// use std::time::Duration; /// /// let mut events = Events::with_capacity(1024); @@ -1486,7 +1486,7 @@ impl Events { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { - /// use urca::{Events, Poll}; + /// use corcovado::{Events, Poll}; /// use std::time::Duration; /// /// let mut events = Events::with_capacity(1024); @@ -1597,7 +1597,7 @@ impl Registration { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { - /// use urca::{Events, Ready, Registration, Poll, PollOpt, Token}; + /// use corcovado::{Events, Ready, Registration, Poll, PollOpt, Token}; /// use std::thread; /// /// let (registration, set_readiness) = Registration::new2(); @@ -1781,7 +1781,7 @@ impl SetReadiness { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { - /// use urca::{Registration, Ready}; + /// use corcovado::{Registration, Ready}; /// /// let (registration, set_readiness) = Registration::new2(); /// @@ -1821,7 +1821,7 @@ impl SetReadiness { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { - /// use urca::{Events, Registration, Ready, Poll, PollOpt, Token}; + /// use corcovado::{Events, Registration, Ready, Poll, PollOpt, Token}; /// /// let poll = Poll::new()?; /// let (registration, set_readiness) = Registration::new2(); @@ -1859,7 +1859,7 @@ impl SetReadiness { /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { - /// use urca::{Registration, Ready}; + /// use corcovado::{Registration, Ready}; /// /// let (registration, set_readiness) = Registration::new2(); /// diff --git a/urca/src/sys/fuchsia/awakener.rs b/corcovado/src/sys/fuchsia/awakener.rs similarity index 100% rename from urca/src/sys/fuchsia/awakener.rs rename to corcovado/src/sys/fuchsia/awakener.rs diff --git a/urca/src/sys/fuchsia/eventedfd.rs b/corcovado/src/sys/fuchsia/eventedfd.rs similarity index 100% rename from urca/src/sys/fuchsia/eventedfd.rs rename to corcovado/src/sys/fuchsia/eventedfd.rs diff --git a/urca/src/sys/fuchsia/handles.rs b/corcovado/src/sys/fuchsia/handles.rs similarity index 100% rename from urca/src/sys/fuchsia/handles.rs rename to corcovado/src/sys/fuchsia/handles.rs diff --git a/urca/src/sys/fuchsia/mod.rs b/corcovado/src/sys/fuchsia/mod.rs similarity index 100% rename from urca/src/sys/fuchsia/mod.rs rename to corcovado/src/sys/fuchsia/mod.rs diff --git a/urca/src/sys/fuchsia/net.rs b/corcovado/src/sys/fuchsia/net.rs similarity index 100% rename from urca/src/sys/fuchsia/net.rs rename to corcovado/src/sys/fuchsia/net.rs diff --git a/urca/src/sys/fuchsia/ready.rs b/corcovado/src/sys/fuchsia/ready.rs similarity index 100% rename from urca/src/sys/fuchsia/ready.rs rename to corcovado/src/sys/fuchsia/ready.rs diff --git a/urca/src/sys/fuchsia/selector.rs b/corcovado/src/sys/fuchsia/selector.rs similarity index 100% rename from urca/src/sys/fuchsia/selector.rs rename to corcovado/src/sys/fuchsia/selector.rs diff --git a/urca/src/sys/mod.rs b/corcovado/src/sys/mod.rs similarity index 100% rename from urca/src/sys/mod.rs rename to corcovado/src/sys/mod.rs diff --git a/urca/src/sys/unix/awakener.rs b/corcovado/src/sys/unix/awakener.rs similarity index 100% rename from urca/src/sys/unix/awakener.rs rename to corcovado/src/sys/unix/awakener.rs diff --git a/urca/src/sys/unix/dlsym.rs b/corcovado/src/sys/unix/dlsym.rs similarity index 100% rename from urca/src/sys/unix/dlsym.rs rename to corcovado/src/sys/unix/dlsym.rs diff --git a/urca/src/sys/unix/epoll.rs b/corcovado/src/sys/unix/epoll.rs similarity index 100% rename from urca/src/sys/unix/epoll.rs rename to corcovado/src/sys/unix/epoll.rs diff --git a/urca/src/sys/unix/eventedfd.rs b/corcovado/src/sys/unix/eventedfd.rs similarity index 93% rename from urca/src/sys/unix/eventedfd.rs rename to corcovado/src/sys/unix/eventedfd.rs index 09ac7d0d..4181c099 100644 --- a/urca/src/sys/unix/eventedfd.rs +++ b/corcovado/src/sys/unix/eventedfd.rs @@ -31,8 +31,8 @@ use {io, poll, Poll, PollOpt, Ready, Token}; /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { -/// use urca::{Ready, Poll, PollOpt, Token}; -/// use urca::unix::EventedFd; +/// use corcovado::{Ready, Poll, PollOpt, Token}; +/// use corcovado::unix::EventedFd; /// /// use std::os::unix::io::AsRawFd; /// use std::net::TcpListener; @@ -56,9 +56,9 @@ use {io, poll, Poll, PollOpt, Ready, Token}; /// Implementing [`Evented`] for a custom type backed by a [`RawFd`]. /// /// ``` -/// use urca::{Ready, Poll, PollOpt, Token}; -/// use urca::event::Evented; -/// use urca::unix::EventedFd; +/// use corcovado::{Ready, Poll, PollOpt, Token}; +/// use corcovado::event::Evented; +/// use corcovado::unix::EventedFd; /// /// use std::os::unix::io::RawFd; /// use std::io; diff --git a/urca/src/sys/unix/io.rs b/corcovado/src/sys/unix/io.rs similarity index 100% rename from urca/src/sys/unix/io.rs rename to corcovado/src/sys/unix/io.rs diff --git a/urca/src/sys/unix/kqueue.rs b/corcovado/src/sys/unix/kqueue.rs similarity index 100% rename from urca/src/sys/unix/kqueue.rs rename to corcovado/src/sys/unix/kqueue.rs diff --git a/urca/src/sys/unix/mod.rs b/corcovado/src/sys/unix/mod.rs similarity index 100% rename from urca/src/sys/unix/mod.rs rename to corcovado/src/sys/unix/mod.rs diff --git a/urca/src/sys/unix/ready.rs b/corcovado/src/sys/unix/ready.rs similarity index 95% rename from urca/src/sys/unix/ready.rs rename to corcovado/src/sys/unix/ready.rs index 83e2f455..a9a09d0d 100644 --- a/urca/src/sys/unix/ready.rs +++ b/corcovado/src/sys/unix/ready.rs @@ -26,8 +26,8 @@ use std::ops; /// Most of the time, all that is needed is using bit operations /// /// ``` -/// use urca::Ready; -/// use urca::unix::UnixReady; +/// use corcovado::Ready; +/// use corcovado::unix::UnixReady; /// /// let ready = Ready::readable() | UnixReady::hup(); /// @@ -38,8 +38,8 @@ use std::ops; /// Basic conversion between ready types. /// /// ``` -/// use urca::Ready; -/// use urca::unix::UnixReady; +/// use corcovado::Ready; +/// use corcovado::unix::UnixReady; /// /// // Start with a portable ready /// let ready = Ready::readable(); @@ -66,9 +66,9 @@ use std::ops; /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { -/// use urca::{Ready, Poll, PollOpt, Token}; -/// use urca::net::TcpStream; -/// use urca::unix::UnixReady; +/// use corcovado::{Ready, Poll, PollOpt, Token}; +/// use corcovado::net::TcpStream; +/// use corcovado::unix::UnixReady; /// /// let addr = "216.58.193.68:80".parse()?; /// let socket = TcpStream::connect(&addr)?; @@ -164,7 +164,7 @@ impl UnixReady { /// # Examples /// /// ``` - /// use urca::unix::UnixReady; + /// use corcovado::unix::UnixReady; /// /// let ready = UnixReady::aio(); /// @@ -207,7 +207,7 @@ impl UnixReady { /// # Examples /// /// ``` - /// use urca::unix::UnixReady; + /// use corcovado::unix::UnixReady; /// /// let ready = UnixReady::error(); /// @@ -237,7 +237,7 @@ impl UnixReady { /// # Examples /// /// ``` - /// use urca::unix::UnixReady; + /// use corcovado::unix::UnixReady; /// /// let ready = UnixReady::hup(); /// @@ -259,7 +259,7 @@ impl UnixReady { /// # Examples /// /// ``` - /// use urca::unix::UnixReady; + /// use corcovado::unix::UnixReady; /// /// let ready = UnixReady::lio(); /// @@ -280,7 +280,7 @@ impl UnixReady { /// # Examples /// /// ``` - /// use urca::unix::UnixReady; + /// use corcovado::unix::UnixReady; /// /// let ready = UnixReady::priority(); /// @@ -306,7 +306,7 @@ impl UnixReady { /// # Examples /// /// ``` - /// use urca::unix::UnixReady; + /// use corcovado::unix::UnixReady; /// /// let ready = UnixReady::aio(); /// @@ -350,7 +350,7 @@ impl UnixReady { /// # Examples /// /// ``` - /// use urca::unix::UnixReady; + /// use corcovado::unix::UnixReady; /// /// let ready = UnixReady::error(); /// @@ -379,7 +379,7 @@ impl UnixReady { /// # Examples /// /// ``` - /// use urca::unix::UnixReady; + /// use corcovado::unix::UnixReady; /// /// let ready = UnixReady::hup(); /// @@ -400,7 +400,7 @@ impl UnixReady { /// # Examples /// /// ``` - /// use urca::unix::UnixReady; + /// use corcovado::unix::UnixReady; /// /// let ready = UnixReady::lio(); /// @@ -419,7 +419,7 @@ impl UnixReady { /// # Examples /// /// ``` - /// use urca::unix::UnixReady; + /// use corcovado::unix::UnixReady; /// /// let ready = UnixReady::priority(); /// diff --git a/urca/src/sys/unix/tcp.rs b/corcovado/src/sys/unix/tcp.rs similarity index 100% rename from urca/src/sys/unix/tcp.rs rename to corcovado/src/sys/unix/tcp.rs diff --git a/urca/src/sys/unix/udp.rs b/corcovado/src/sys/unix/udp.rs similarity index 100% rename from urca/src/sys/unix/udp.rs rename to corcovado/src/sys/unix/udp.rs diff --git a/urca/src/sys/unix/uds.rs b/corcovado/src/sys/unix/uds.rs similarity index 100% rename from urca/src/sys/unix/uds.rs rename to corcovado/src/sys/unix/uds.rs diff --git a/urca/src/sys/unix/uio.rs b/corcovado/src/sys/unix/uio.rs similarity index 100% rename from urca/src/sys/unix/uio.rs rename to corcovado/src/sys/unix/uio.rs diff --git a/urca/src/sys/windows/awakener.rs b/corcovado/src/sys/windows/awakener.rs similarity index 100% rename from urca/src/sys/windows/awakener.rs rename to corcovado/src/sys/windows/awakener.rs diff --git a/urca/src/sys/windows/buffer_pool.rs b/corcovado/src/sys/windows/buffer_pool.rs similarity index 100% rename from urca/src/sys/windows/buffer_pool.rs rename to corcovado/src/sys/windows/buffer_pool.rs diff --git a/urca/src/sys/windows/from_raw_arc.rs b/corcovado/src/sys/windows/from_raw_arc.rs similarity index 100% rename from urca/src/sys/windows/from_raw_arc.rs rename to corcovado/src/sys/windows/from_raw_arc.rs diff --git a/urca/src/sys/windows/mod.rs b/corcovado/src/sys/windows/mod.rs similarity index 100% rename from urca/src/sys/windows/mod.rs rename to corcovado/src/sys/windows/mod.rs diff --git a/urca/src/sys/windows/selector.rs b/corcovado/src/sys/windows/selector.rs similarity index 100% rename from urca/src/sys/windows/selector.rs rename to corcovado/src/sys/windows/selector.rs diff --git a/urca/src/sys/windows/tcp.rs b/corcovado/src/sys/windows/tcp.rs similarity index 100% rename from urca/src/sys/windows/tcp.rs rename to corcovado/src/sys/windows/tcp.rs diff --git a/urca/src/sys/windows/udp.rs b/corcovado/src/sys/windows/udp.rs similarity index 100% rename from urca/src/sys/windows/udp.rs rename to corcovado/src/sys/windows/udp.rs diff --git a/urca/src/timer.rs b/corcovado/src/timer.rs similarity index 99% rename from urca/src/timer.rs rename to corcovado/src/timer.rs index ad3112e7..c39e6256 100644 --- a/urca/src/timer.rs +++ b/corcovado/src/timer.rs @@ -32,7 +32,7 @@ mod convert { /// /// Typical usage goes like this: /// -/// * register the timer with a `urca::Poll`. +/// * register the timer with a `corcovado::Poll`. /// * set a timeout, by calling `Timer::set_timeout`. Here you provide some /// state to be associated with this timeout. /// * poll the `Poll`, to learn when a timeout has occurred. diff --git a/urca/src/token.rs b/corcovado/src/token.rs similarity index 98% rename from urca/src/token.rs rename to corcovado/src/token.rs index f960a536..2095b940 100644 --- a/urca/src/token.rs +++ b/corcovado/src/token.rs @@ -13,8 +13,8 @@ /// ``` /// # use std::error::Error; /// # fn try_main() -> Result<(), Box> { -/// use urca::{Events, Ready, Poll, PollOpt, Token}; -/// use urca::net::TcpListener; +/// use corcovado::{Events, Ready, Poll, PollOpt, Token}; +/// use corcovado::net::TcpListener; /// /// use std::thread; /// use std::io::{self, Read}; diff --git a/urca/test/benchmark.rs b/corcovado/test/benchmark.rs similarity index 94% rename from urca/test/benchmark.rs rename to corcovado/test/benchmark.rs index 81fc5ee5..c7f0cc4a 100644 --- a/urca/test/benchmark.rs +++ b/corcovado/test/benchmark.rs @@ -1,9 +1,9 @@ use std::mem; -use urca::net::{AddressFamily, Inet, Inet6, SockAddr, InetAddr, IPv4Addr, SocketType, Dgram, Stream}; +use corcovado::net::{AddressFamily, Inet, Inet6, SockAddr, InetAddr, IPv4Addr, SocketType, Dgram, Stream}; use std::io::net::ip::IpAddr; use native::NativeTaskBuilder; use std::task::TaskBuilder; -use urca::os::{from_sockaddr}; +use corcovado::os::{from_sockaddr}; use time::Instant; use std::vec::*; use std::io::timer; diff --git a/urca/test/mod.rs b/corcovado/test/mod.rs similarity index 98% rename from urca/test/mod.rs rename to corcovado/test/mod.rs index 5d61d1fb..05d8a2f2 100644 --- a/urca/test/mod.rs +++ b/corcovado/test/mod.rs @@ -1,7 +1,7 @@ #![allow(deprecated)] extern crate bytes; -extern crate urca; +extern crate corcovado extern crate net2; #[macro_use] @@ -39,8 +39,8 @@ mod test_write_then_drop; mod test_fuchsia_handles; use bytes::{Buf, MutBuf}; -use urca::event::Event; -use urca::{Events, Poll}; +use corcovado::event::Event; +use corcovado::{Events, Poll}; use std::io::{self, Read, Write}; use std::time::Duration; diff --git a/urca/test/test_broken_pipe.rs b/corcovado/test/test_broken_pipe.rs similarity index 88% rename from urca/test/test_broken_pipe.rs rename to corcovado/test/test_broken_pipe.rs index 2b41ef9e..44ffe193 100644 --- a/urca/test/test_broken_pipe.rs +++ b/corcovado/test/test_broken_pipe.rs @@ -1,5 +1,5 @@ -use urca::deprecated::{unix, EventLoop, Handler}; -use urca::{PollOpt, Ready, Token}; +use corcovado::deprecated::{unix, EventLoop, Handler}; +use corcovado::{PollOpt, Ready, Token}; use std::time::Duration; pub struct BrokenPipeHandler; diff --git a/urca/test/test_close_on_drop.rs b/corcovado/test/test_close_on_drop.rs similarity index 97% rename from urca/test/test_close_on_drop.rs rename to corcovado/test/test_close_on_drop.rs index 0213ce8a..9679ea76 100644 --- a/urca/test/test_close_on_drop.rs +++ b/corcovado/test/test_close_on_drop.rs @@ -1,6 +1,6 @@ // use bytes::ByteBuf; -// use urca::net::{TcpListener, TcpStream}; -// use urca::{Events, Poll, PollOpt, Ready, Token}; +// use corcovado::net::{TcpListener, TcpStream}; +// use corcovado::{Events, Poll, PollOpt, Ready, Token}; // use {localhost, TryRead}; // use self::TestState::{AfterRead, Initial}; diff --git a/urca/test/test_custom_evented.rs b/corcovado/test/test_custom_evented.rs similarity index 98% rename from urca/test/test_custom_evented.rs rename to corcovado/test/test_custom_evented.rs index 66ce8ae2..98c7514c 100644 --- a/urca/test/test_custom_evented.rs +++ b/corcovado/test/test_custom_evented.rs @@ -1,5 +1,5 @@ -use urca::event::Evented; -use urca::{Events, Poll, PollOpt, Ready, Registration, SetReadiness, Token}; +use corcovado::event::Evented; +use corcovado::{Events, Poll, PollOpt, Ready, Registration, SetReadiness, Token}; use std::time::Duration; #[test] @@ -73,8 +73,8 @@ fn set_readiness_before_register() { #[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))] mod stress { - use urca::event::Evented; - use urca::{Events, Poll, PollOpt, Ready, Registration, SetReadiness, Token}; + use corcovado::event::Evented; + use corcovado::{Events, Poll, PollOpt, Ready, Registration, SetReadiness, Token}; use std::time::Duration; #[test] diff --git a/urca/test/test_double_register.rs b/corcovado/test/test_double_register.rs similarity index 89% rename from urca/test/test_double_register.rs rename to corcovado/test/test_double_register.rs index eda9b4be..74a78000 100644 --- a/urca/test/test_double_register.rs +++ b/corcovado/test/test_double_register.rs @@ -3,8 +3,8 @@ #[test] #[cfg(any(target_os = "linux", target_os = "windows"))] pub fn test_double_register() { - use urca::net::TcpListener; - use urca::*; + use corcovado::net::TcpListener; + use corcovado::*; let poll = Poll::new().unwrap(); diff --git a/urca/test/test_echo_server.rs b/corcovado/test/test_echo_server.rs similarity index 99% rename from urca/test/test_echo_server.rs rename to corcovado/test/test_echo_server.rs index f753235b..34932a7e 100644 --- a/urca/test/test_echo_server.rs +++ b/corcovado/test/test_echo_server.rs @@ -1,6 +1,6 @@ // use bytes::{Buf, ByteBuf, MutByteBuf, SliceBuf}; -// use urca::net::{TcpListener, TcpStream}; -// use urca::{Events, Poll, PollOpt, Ready, Token}; +// use corcovado::net::{TcpListener, TcpStream}; +// use corcovado::{Events, Poll, PollOpt, Ready, Token}; // use slab::Slab; // use std::io; // use {localhost, TryRead, TryWrite}; diff --git a/urca/test/test_fuchsia_handles.rs b/corcovado/test/test_fuchsia_handles.rs similarity index 94% rename from urca/test/test_fuchsia_handles.rs rename to corcovado/test/test_fuchsia_handles.rs index 160d4073..9155303c 100644 --- a/urca/test/test_fuchsia_handles.rs +++ b/corcovado/test/test_fuchsia_handles.rs @@ -1,5 +1,5 @@ -use urca::fuchsia::EventedHandle; -use urca::*; +use corcovado::fuchsia::EventedHandle; +use corcovado::*; use std::time::Duration; use zircon::{self, AsHandleRef}; diff --git a/urca/test/test_local_addr_ready.rs b/corcovado/test/test_local_addr_ready.rs similarity index 95% rename from urca/test/test_local_addr_ready.rs rename to corcovado/test/test_local_addr_ready.rs index 57457ee1..5d8477f8 100644 --- a/urca/test/test_local_addr_ready.rs +++ b/corcovado/test/test_local_addr_ready.rs @@ -1,5 +1,5 @@ -// use urca::net::{TcpListener, TcpStream}; -// use urca::{Events, Poll, PollOpt, Ready, Token}; +// use corcovado::net::{TcpListener, TcpStream}; +// use corcovado::{Events, Poll, PollOpt, Ready, Token}; // use TryWrite; // const LISTEN: Token = Token(0); diff --git a/urca/test/test_multicast.rs b/corcovado/test/test_multicast.rs similarity index 98% rename from urca/test/test_multicast.rs rename to corcovado/test/test_multicast.rs index 1420d928..09188cd4 100644 --- a/urca/test/test_multicast.rs +++ b/corcovado/test/test_multicast.rs @@ -5,7 +5,7 @@ // use bytes::{Buf, MutBuf, RingBuf, SliceBuf}; // use localhost; // use std::net::UdpSocket; -// use urca::{Events, Poll, PollOpt, Ready, Token}; +// use corcovado::{Events, Poll, PollOpt, Ready, Token}; // use std::net::IpAddr; // use std::str; diff --git a/urca/test/test_oneshot.rs b/corcovado/test/test_oneshot.rs similarity index 99% rename from urca/test/test_oneshot.rs rename to corcovado/test/test_oneshot.rs index 314ce5d6..81534c5c 100644 --- a/urca/test/test_oneshot.rs +++ b/corcovado/test/test_oneshot.rs @@ -1,5 +1,5 @@ // use std::net::{TcpListener, TcpStream}; -// use urca::*; +// use corcovado::*; // use std::io::*; // use std::time::Duration; diff --git a/urca/test/test_poll.rs b/corcovado/test/test_poll.rs similarity index 96% rename from urca/test/test_poll.rs rename to corcovado/test/test_poll.rs index bc0a74fc..154dd261 100644 --- a/urca/test/test_poll.rs +++ b/corcovado/test/test_poll.rs @@ -1,4 +1,4 @@ -use urca::*; +use corcovado::*; use std::time::Duration; #[test] diff --git a/urca/test/test_register_deregister.rs b/corcovado/test/test_register_deregister.rs similarity index 96% rename from urca/test/test_register_deregister.rs rename to corcovado/test/test_register_deregister.rs index 5c1fb837..8e0cca85 100644 --- a/urca/test/test_register_deregister.rs +++ b/corcovado/test/test_register_deregister.rs @@ -1,7 +1,7 @@ // use bytes::SliceBuf; -// use urca::event::Event; -// use urca::net::{TcpListener, TcpStream}; -// use urca::{Events, Poll, PollOpt, Ready, Token}; +// use corcovado::event::Event; +// use corcovado::net::{TcpListener, TcpStream}; +// use corcovado::{Events, Poll, PollOpt, Ready, Token}; // use std::time::Duration; // use {expect_events, localhost, TryWrite}; diff --git a/urca/test/test_register_multiple_event_loops.rs b/corcovado/test/test_register_multiple_event_loops.rs similarity index 97% rename from urca/test/test_register_multiple_event_loops.rs rename to corcovado/test/test_register_multiple_event_loops.rs index a17862ee..64bbc754 100644 --- a/urca/test/test_register_multiple_event_loops.rs +++ b/corcovado/test/test_register_multiple_event_loops.rs @@ -1,6 +1,6 @@ // use localhost; -// use urca::net::{TcpListener, TcpStream, UdpSocket}; -// use urca::*; +// use corcovado::net::{TcpListener, TcpStream, UdpSocket}; +// use corcovado::*; // use std::io::ErrorKind; // #[test] diff --git a/urca/test/test_reregister_without_poll.rs b/corcovado/test/test_reregister_without_poll.rs similarity index 93% rename from urca/test/test_reregister_without_poll.rs rename to corcovado/test/test_reregister_without_poll.rs index 84c2907e..c557f95d 100644 --- a/urca/test/test_reregister_without_poll.rs +++ b/corcovado/test/test_reregister_without_poll.rs @@ -1,5 +1,5 @@ -// use urca::net::{TcpListener, TcpStream}; -// use urca::*; +// use corcovado::net::{TcpListener, TcpStream}; +// use corcovado::*; // use sleep_ms; // use std::time::Duration; diff --git a/urca/test/test_smoke.rs b/corcovado/test/test_smoke.rs similarity index 86% rename from urca/test/test_smoke.rs rename to corcovado/test/test_smoke.rs index ac7f1ce0..09d1d3a8 100644 --- a/urca/test/test_smoke.rs +++ b/corcovado/test/test_smoke.rs @@ -1,7 +1,7 @@ -// extern crate urca; +// extern crate corcovado -// use urca::net::TcpListener; -// use urca::{Events, Poll, PollOpt, Ready, Token}; +// use corcovado::net::TcpListener; +// use corcovado::{Events, Poll, PollOpt, Ready, Token}; // use std::time::Duration; // #[test] diff --git a/urca/test/test_tcp.rs b/corcovado/test/test_tcp.rs similarity index 99% rename from urca/test/test_tcp.rs rename to corcovado/test/test_tcp.rs index dc7e65f6..eaefaeb5 100644 --- a/urca/test/test_tcp.rs +++ b/corcovado/test/test_tcp.rs @@ -9,8 +9,8 @@ // use net2::{self, TcpStreamExt}; // use iovec::IoVec; -// use urca::net::{TcpListener, TcpStream}; -// use urca::{Events, Poll, PollOpt, Ready, Token}; +// use corcovado::net::{TcpListener, TcpStream}; +// use corcovado::{Events, Poll, PollOpt, Ready, Token}; // use {TryRead, TryWrite}; // #[test] diff --git a/urca/test/test_tcp_level.rs b/corcovado/test/test_tcp_level.rs similarity index 97% rename from urca/test/test_tcp_level.rs rename to corcovado/test/test_tcp_level.rs index 2c72fb32..4eec44f3 100644 --- a/urca/test/test_tcp_level.rs +++ b/corcovado/test/test_tcp_level.rs @@ -1,6 +1,6 @@ -// use urca::event::Event; -// use urca::net::{TcpListener, TcpStream}; -// use urca::{Events, Poll, PollOpt, Ready, Token}; +// use corcovado::event::Event; +// use corcovado::net::{TcpListener, TcpStream}; +// use corcovado::{Events, Poll, PollOpt, Ready, Token}; // use std::io::Write; // use std::time::Duration; // use {expect_events, sleep_ms, TryRead}; diff --git a/urca/test/test_tcp_shutdown.rs b/corcovado/test/test_tcp_shutdown.rs similarity index 97% rename from urca/test/test_tcp_shutdown.rs rename to corcovado/test/test_tcp_shutdown.rs index 1b71e7ba..6ff1b814 100644 --- a/urca/test/test_tcp_shutdown.rs +++ b/corcovado/test/test_tcp_shutdown.rs @@ -2,9 +2,9 @@ // use std::net::{self, Shutdown}; // use std::time::{Duration, Instant}; -// use urca::event::{Event, Evented}; -// use urca::net::TcpStream; -// use urca::{Events, Poll, PollOpt, Ready, Token}; +// use corcovado::event::{Event, Evented}; +// use corcovado::net::TcpStream; +// use corcovado::{Events, Poll, PollOpt, Ready, Token}; // struct TestPoll { // poll: Poll, @@ -97,7 +97,7 @@ // ($poll:expr) => { // #[cfg(unix)] // { -// use urca::unix::UnixReady; +// use corcovado::unix::UnixReady; // assert_ready!($poll, Token(0), Ready::from(UnixReady::hup())) // } // }; @@ -107,7 +107,7 @@ // ($poll:expr) => { // #[cfg(unix)] // { -// use urca::unix::UnixReady; +// use corcovado::unix::UnixReady; // assert_not_ready!($poll, Token(0), Ready::from(UnixReady::hup())) // } // }; diff --git a/urca/test/test_udp_level.rs b/corcovado/test/test_udp_level.rs similarity index 94% rename from urca/test/test_udp_level.rs rename to corcovado/test/test_udp_level.rs index 857624b6..7f9b1266 100644 --- a/urca/test/test_udp_level.rs +++ b/corcovado/test/test_udp_level.rs @@ -1,6 +1,6 @@ -// use urca::event::Event; -// use urca::net::UdpSocket; -// use urca::{Events, Poll, PollOpt, Ready, Token}; +// use corcovado::event::Event; +// use corcovado::net::UdpSocket; +// use corcovado::{Events, Poll, PollOpt, Ready, Token}; // use {expect_events, sleep_ms}; // #[test] diff --git a/urca/test/test_udp_socket.rs b/corcovado/test/test_udp_socket.rs similarity index 98% rename from urca/test/test_udp_socket.rs rename to corcovado/test/test_udp_socket.rs index 145abe23..94373aa5 100644 --- a/urca/test/test_udp_socket.rs +++ b/corcovado/test/test_udp_socket.rs @@ -1,8 +1,8 @@ // use bytes::{Buf, MutBuf, RingBuf, SliceBuf}; // use iovec::IoVec; // use localhost; -// use urca::net::UdpSocket; -// use urca::{Events, Poll, PollOpt, Ready, Token}; +// use corcovado::net::UdpSocket; +// use corcovado::{Events, Poll, PollOpt, Ready, Token}; // use std::io::ErrorKind; // use std::str; // use std::time; diff --git a/urca/test/test_write_then_drop.rs b/corcovado/test/test_write_then_drop.rs similarity index 95% rename from urca/test/test_write_then_drop.rs rename to corcovado/test/test_write_then_drop.rs index 7c1b27f3..b443aea6 100644 --- a/urca/test/test_write_then_drop.rs +++ b/corcovado/test/test_write_then_drop.rs @@ -1,8 +1,8 @@ // use std::io::{Read, Write}; -// use urca::event::Evented; -// use urca::net::{TcpListener, TcpStream}; -// use urca::{Events, Poll, PollOpt, Ready, Token}; +// use corcovado::event::Evented; +// use corcovado::net::{TcpListener, TcpStream}; +// use corcovado::{Events, Poll, PollOpt, Ready, Token}; // #[test] // fn write_then_drop() { diff --git a/rio/Cargo.toml b/rio/Cargo.toml index 6e0c8747..b23735c4 100644 --- a/rio/Cargo.toml +++ b/rio/Cargo.toml @@ -14,7 +14,7 @@ bitflags = "2.0.2" bytemuck = { workspace = true } colors = { path = "../colors" } config = { path = "../config" } -urca = { path = "../urca" } +corcovado = { path = "../corcovado" } clap = { version = "4.2.7", features = ["derive"] } copypasta = { version = "0.8.1", default-features = false } dirs = "5.0" diff --git a/rio/src/performer/mod.rs b/rio/src/performer/mod.rs index 1d0d8676..c934b4ea 100644 --- a/rio/src/performer/mod.rs +++ b/rio/src/performer/mod.rs @@ -4,10 +4,10 @@ use crate::crosswords::Crosswords; use crate::event::sync::FairMutex; use crate::event::EventListener; use log::error; -use urca::channel; +use corcovado::channel; #[cfg(unix)] -use urca::unix::UnixReady; -use urca::{self, Events, PollOpt, Ready}; +use corcovado::unix::UnixReady; +use corcovado::{self, Events, PollOpt, Ready}; use crate::event::{Msg, RioEvent}; @@ -28,7 +28,7 @@ pub struct Machine { sender: channel::Sender, receiver: channel::Receiver, pty: T, - poll: urca::Poll, + poll: corcovado::Poll, terminal: Arc>>, event_proxy: U, } @@ -111,7 +111,7 @@ where ) -> Result, Box> { // let (mut sender, mut receiver) = unbounded::(); let (sender, receiver) = channel::channel(); - let poll = urca::Poll::new()?; + let poll = corcovado::Poll::new()?; Ok(Machine { sender, @@ -202,7 +202,7 @@ where /// Returns a `bool` indicating whether or not the event loop should continue running. #[inline] - fn channel_event(&mut self, token: urca::Token, state: &mut State) -> bool { + fn channel_event(&mut self, token: corcovado::Token, state: &mut State) -> bool { if !self.should_keep_alive(state) { return false; } diff --git a/rio/src/screen/messenger.rs b/rio/src/screen/messenger.rs index 499e84c5..d0dd99ee 100644 --- a/rio/src/screen/messenger.rs +++ b/rio/src/screen/messenger.rs @@ -3,11 +3,11 @@ use std::borrow::Cow; use teletypewriter::WinsizeBuilder; pub struct Messenger { - channel: urca::channel::Sender, + channel: corcovado::channel::Sender, } impl Messenger { - pub fn new(channel: urca::channel::Sender) -> Messenger { + pub fn new(channel: corcovado::channel::Sender) -> Messenger { Messenger { channel } } diff --git a/teletypewriter/Cargo.toml b/teletypewriter/Cargo.toml index 2100bde3..661b4c8b 100644 --- a/teletypewriter/Cargo.toml +++ b/teletypewriter/Cargo.toml @@ -11,7 +11,7 @@ authors = { workspace = true } [dependencies] libc = "0.2.140" dirs = "5.0" -urca = { path = "../urca" } +corcovado = { path = "../corcovado" } [target.'cfg(unix)'.dependencies] signal-hook = "0.3.10" diff --git a/teletypewriter/src/lib.rs b/teletypewriter/src/lib.rs index 851fb2b4..c840fa6e 100644 --- a/teletypewriter/src/lib.rs +++ b/teletypewriter/src/lib.rs @@ -24,25 +24,25 @@ pub trait ProcessReadWrite { type Reader: io::Read; type Writer: io::Write; fn reader(&mut self) -> &mut Self::Reader; - fn read_token(&self) -> urca::Token; + fn read_token(&self) -> corcovado::Token; fn writer(&mut self) -> &mut Self::Writer; - fn write_token(&self) -> urca::Token; + fn write_token(&self) -> corcovado::Token; fn set_winsize(&mut self, _: WinsizeBuilder) -> Result<(), io::Error>; fn register( &mut self, - _: &urca::Poll, - _: &mut dyn Iterator, - _: urca::Ready, - _: urca::PollOpt, + _: &corcovado::Poll, + _: &mut dyn Iterator, + _: corcovado::Ready, + _: corcovado::PollOpt, ) -> io::Result<()>; fn reregister( &mut self, - _: &urca::Poll, - _: urca::Ready, - _: urca::PollOpt, + _: &corcovado::Poll, + _: corcovado::Ready, + _: corcovado::PollOpt, ) -> io::Result<()>; - fn deregister(&mut self, _: &urca::Poll) -> io::Result<()>; + fn deregister(&mut self, _: &corcovado::Poll) -> io::Result<()>; } #[derive(Debug, PartialEq, Eq)] @@ -52,7 +52,7 @@ pub enum ChildEvent { } pub trait EventedPty: ProcessReadWrite { - fn child_event_token(&self) -> urca::Token; + fn child_event_token(&self) -> corcovado::Token; /// Tries to retrieve an event. /// diff --git a/teletypewriter/src/unix/mod.rs b/teletypewriter/src/unix/mod.rs index 5ab16cd4..fa7a959c 100644 --- a/teletypewriter/src/unix/mod.rs +++ b/teletypewriter/src/unix/mod.rs @@ -19,7 +19,7 @@ use std::path::PathBuf; use std::process::Command; use std::ptr; use std::sync::Arc; -use urca::unix::EventedFd; +use corcovado::unix::EventedFd; #[cfg(target_os = "linux")] const TIOCSWINSZ: libc::c_ulong = 0x5414; @@ -73,8 +73,8 @@ fn default_shell_command(shell: &str) { pub struct Pty { pub child: Child, file: File, - token: urca::Token, - signals_token: urca::Token, + token: corcovado::Token, + signals_token: corcovado::Token, signals: Signals, } @@ -128,7 +128,7 @@ impl ProcessReadWrite for Pty { } #[inline] - fn read_token(&self) -> urca::Token { + fn read_token(&self) -> corcovado::Token { self.token } @@ -138,7 +138,7 @@ impl ProcessReadWrite for Pty { } #[inline] - fn write_token(&self) -> urca::Token { + fn write_token(&self) -> corcovado::Token { self.token } @@ -150,10 +150,10 @@ impl ProcessReadWrite for Pty { #[inline] fn register( &mut self, - poll: &urca::Poll, - token: &mut dyn Iterator, - interest: urca::Ready, - poll_opts: urca::PollOpt, + poll: &corcovado::Poll, + token: &mut dyn Iterator, + interest: corcovado::Ready, + poll_opts: corcovado::PollOpt, ) -> io::Result<()> { self.token = token.next().unwrap(); poll.register( @@ -167,16 +167,16 @@ impl ProcessReadWrite for Pty { poll.register( &self.signals, self.signals_token, - urca::Ready::readable(), - urca::PollOpt::level(), + corcovado::Ready::readable(), + corcovado::PollOpt::level(), ) } fn reregister( &mut self, - poll: &urca::Poll, - interest: urca::Ready, - poll_opts: urca::PollOpt, + poll: &corcovado::Poll, + interest: corcovado::Ready, + poll_opts: corcovado::PollOpt, ) -> io::Result<()> { poll.reregister( &EventedFd(&self.file.as_raw_fd()), @@ -188,12 +188,12 @@ impl ProcessReadWrite for Pty { poll.reregister( &self.signals, self.signals_token, - urca::Ready::readable(), - urca::PollOpt::level(), + corcovado::Ready::readable(), + corcovado::PollOpt::level(), ) } - fn deregister(&mut self, poll: &urca::Poll) -> io::Result<()> { + fn deregister(&mut self, poll: &corcovado::Poll) -> io::Result<()> { poll.deregister(&EventedFd(&self.file.as_raw_fd()))?; poll.deregister(&self.signals) } @@ -364,8 +364,8 @@ pub fn create_pty(shell: &str, columns: u16, rows: u16) -> Pty { child, signals, file: unsafe { File::from_raw_fd(main) }, - token: urca::Token(0), - signals_token: urca::Token(0), + token: corcovado::Token(0), + signals_token: corcovado::Token(0), } } _ => panic!("Fork failed."), @@ -493,7 +493,7 @@ impl EventedPty for Pty { } #[inline] - fn child_event_token(&self) -> urca::Token { + fn child_event_token(&self) -> corcovado::Token { self.signals_token } } diff --git a/teletypewriter/src/unix/signals.rs b/teletypewriter/src/unix/signals.rs index f62f991b..9e6f003a 100644 --- a/teletypewriter/src/unix/signals.rs +++ b/teletypewriter/src/unix/signals.rs @@ -1,7 +1,7 @@ use crate::unix::stream; use std::io::Error; -use urca::event::Evented; -use urca::{Poll, PollOpt, Ready, Token}; +use corcovado::event::Evented; +use corcovado::{Poll, PollOpt, Ready, Token}; macro_rules! implement_signals_with_pipe { ($pipe:path) => { @@ -67,7 +67,7 @@ macro_rules! implement_signals_with_pipe { /// /// This method returns immediately (does not block) and may produce an empty iterator if there /// are no signals ready. So you should register an instance of this struct at an instance of - /// [`urca::Poll`] to query for readability of the underlying self pipe. + /// [`corcovado::Poll`] to query for readability of the underlying self pipe. pub fn pending(&mut self) -> Pending { self.0.pending() } diff --git a/teletypewriter/src/unix/stream.rs b/teletypewriter/src/unix/stream.rs index f60bd8c5..6049c1df 100644 --- a/teletypewriter/src/unix/stream.rs +++ b/teletypewriter/src/unix/stream.rs @@ -11,9 +11,9 @@ use iovec::{ IoVec, }; use libc; -use urca::event::Evented; -use urca::unix::EventedFd; -use urca::{Poll, PollOpt, Ready, Token}; +use corcovado::event::Evented; +use corcovado::unix::EventedFd; +use corcovado::{Poll, PollOpt, Ready, Token}; use crate::unix::socket::{sockaddr_un, Socket}; diff --git a/urca/README.md b/urca/README.md deleted file mode 100644 index 81e8cc6b..00000000 --- a/urca/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Urca - -Urca is a maintained fork of mio 0.6.x along mio-signal-hook, mio-extras and using windows calls that works for Windows 11. It also uses Rust edition 2021 instead of 2018. \ No newline at end of file -- 2.51.2