diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 50910bd..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,11 +0,0 @@ -install: - - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe - - if not defined RUSTFLAGS rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly - - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - - rustc -V - - cargo -V - -build: false - -test_script: - - cargo test --locked diff --git a/.gitignore b/.gitignore index be70f45..46bb844 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ pkg/ wasm-pack.log www + +.travis +.appveyor diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7a91325..0000000 --- a/.travis.yml +++ /dev/null @@ -1,69 +0,0 @@ -language: rust -sudo: false - -cache: cargo - -matrix: - include: - - # Builds with wasm-pack. - - rust: beta - env: RUST_BACKTRACE=1 - addons: - firefox: latest - chrome: stable - before_script: - - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update) - - (test -x $HOME/.cargo/bin/cargo-generate || cargo install --vers "^0.2" cargo-generate) - - cargo install-update -a - - curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -f - script: - - cargo generate --git . --name testing - # Having a broken Cargo.toml (in that it has curlies in fields) anywhere - # in any of our parent dirs is problematic. - - mv Cargo.toml Cargo.toml.tmpl - - cd testing - - wasm-pack build - - wasm-pack test --chrome --firefox --headless - - # Builds on nightly. - - rust: nightly - env: RUST_BACKTRACE=1 - before_script: - - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update) - - (test -x $HOME/.cargo/bin/cargo-generate || cargo install --vers "^0.2" cargo-generate) - - cargo install-update -a - - rustup target add wasm32-unknown-unknown - script: - - cargo generate --git . --name testing - - mv Cargo.toml Cargo.toml.tmpl - - cd testing - - cargo check - - cargo check --target wasm32-unknown-unknown - - cargo check --no-default-features - - cargo check --target wasm32-unknown-unknown --no-default-features - - cargo check --no-default-features --features console_error_panic_hook - - cargo check --target wasm32-unknown-unknown --no-default-features --features console_error_panic_hook - - cargo check --no-default-features --features "console_error_panic_hook wee_alloc" - - cargo check --target wasm32-unknown-unknown --no-default-features --features "console_error_panic_hook wee_alloc" - - # Builds on beta. - - rust: beta - env: RUST_BACKTRACE=1 - before_script: - - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update) - - (test -x $HOME/.cargo/bin/cargo-generate || cargo install --vers "^0.2" cargo-generate) - - cargo install-update -a - - rustup target add wasm32-unknown-unknown - script: - - cargo generate --git . --name testing - - mv Cargo.toml Cargo.toml.tmpl - - cd testing - - cargo check - - cargo check --target wasm32-unknown-unknown - - cargo check --no-default-features - - cargo check --target wasm32-unknown-unknown --no-default-features - - cargo check --no-default-features --features console_error_panic_hook - - cargo check --target wasm32-unknown-unknown --no-default-features --features console_error_panic_hook - # Note: no enabling the `wee_alloc` feature here because it requires - # nightly for now. diff --git a/src/lib.rs b/src/lib.rs index 6924b9e..8ede518 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,7 +20,7 @@ //! device_filter!{vendor_id: 0x054c, product_id: 0x00c9} //! ]; //! -//! let device = cross_usb::get_device_filter(filter).await.expect("Failed to get device"); +//! let device = cross_usb::get_device(filter).await.expect("Failed to get device"); //! //! // Obtain an interface of the device //! let interface = device.open_interface(0).await.expect("Failed to open interface"); @@ -64,16 +64,12 @@ pub use crate::context::UsbInterface; #[doc(inline)] pub use crate::context::DeviceFilter; -/// Gets a single device from the VendorID and ProductID -#[doc(inline)] -pub use crate::context::get_device; - /// Gets a single device from a list of VendorID and ProductIDs /// /// ## Example /// ```no_run /// # tokio_test::block_on(async { -/// use cross_usb::{get_device_filter, DeviceFilter, device_filter}; +/// use cross_usb::{get_device, DeviceFilter, device_filter}; /// /// /// let filter = vec![ @@ -81,11 +77,11 @@ pub use crate::context::get_device; /// device_filter!{vendor_id: 0x054c}, /// ]; /// -/// let device = get_device_filter(filter).await.expect("Could not find device in list"); +/// let device = get_device(filter).await.expect("Could not find device in list"); /// # }) /// ``` #[doc(inline)] -pub use crate::context::get_device_filter; +pub use crate::context::get_device; /// Macro to create a device filter easily from data. ///