Update links and Cargo.toml

ardaku · Aug 28, 2022 · 44879aa · 44879aa
1 parent 8198c39
commit 44879aa
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 128 deletions.
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -1,2 +1,10 @@
+# Don't deviate too much, just reduce columns and stricter enforcement
+edition = "2021"
+unstable_features = true
 max_width = 80
-use_field_init_shorthand = true
+reorder_impl_items = true
+group_imports = "StdExternalCrate"
+imports_granularity = "Crate"
+newline_style = "Unix"
+normalize_doc_attributes = true
+wrap_comments = true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://jeronlau.tk/semver/).
 ### Changed
  - Update to pasts 0.12.0
  - Replace `supports()` with `config()`
+ - Bumped to 2021 edition
 
 ### Removed
  - `Speakers::play()` - use `Notifier` impl on `Speakers` instead

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,22 +9,22 @@
 
 [package]
 name = "wavy"
-version = "0.9.1"
+version = "0.10.0"
 license = "Apache-2.0 OR BSL-1.0 OR MIT"
 
 description = """
 Asynchronous cross-platform real-time audio recording & playback.
 """
-repository = "https://github.com/libcala/wavy"
+repository = "https://github.com/ardaku/wavy"
 documentation = "https://docs.rs/wavy"
-homepage = "https://github.com/libcala/wavy/blob/main/CHANGELOG.md"
+homepage = "https://github.com/ardaku/wavy/blob/stable/CHANGELOG.md"
 include = ["Cargo.toml", "src/*"]
 categories = [
     "game-engines", "hardware-support", "multimedia", "multimedia::audio", "os"
 ]
 keywords = ["audio", "realtime", "cross-platform", "record", "play"]
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 # For all platforms
 [dependencies.fon]

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 #### [Changelog][3] | [Source][4] | [Getting Started][5]
 
-[![tests](https://github.com/libcala/wavy/workflows/tests/badge.svg)][2]
+[![tests](https://github.com/ardaku/wavy/workflows/tests/badge.svg)][2]
 [![docs](https://docs.rs/wavy/badge.svg)][0]
 [![crates.io](https://img.shields.io/crates/v/wavy.svg)][1]
 
@@ -45,15 +45,15 @@ email at [aldaronlau@gmail.com][13].
 
 [0]: https://docs.rs/wavy
 [1]: https://crates.io/crates/wavy
-[2]: https://github.com/libcala/wavy/actions?query=workflow%3Atests
-[3]: https://github.com/libcala/wavy/blob/main/CHANGELOG.md
-[4]: https://github.com/libcala/wavy/
+[2]: https://github.com/ardaku/wavy/actions?query=workflow%3Atests
+[3]: https://github.com/ardaku/wavy/blob/stable/CHANGELOG.md
+[4]: https://github.com/ardaku/wavy/
 [5]: https://docs.rs/wavy#getting-started
 [6]: https://aldaronlau.com/
-[7]: https://github.com/libcala/wavy/blob/main/LICENSE_APACHE_2_0.txt
+[7]: https://github.com/ardaku/wavy/blob/stable/LICENSE_APACHE_2_0.txt
 [8]: https://www.apache.org/licenses/LICENSE-2.0
-[9]: https://github.com/libcala/wavy/blob/main/LICENSE_MIT.txt
+[9]: https://github.com/ardaku/wavy/blob/stable/LICENSE_MIT.txt
 [10]: https://mit-license.org/
-[11]: https://github.com/libcala/wavy/blob/main/LICENSE_BOOST_1_0.txt
+[11]: https://github.com/ardaku/wavy/blob/stable/LICENSE_BOOST_1_0.txt
 [12]: https://www.boost.org/LICENSE_1_0.txt
 [13]: mailto:aldaronlau@gmail.com
diff --git a/src/ffi/dummy/ffi.rs b/src/ffi/dummy/ffi.rs
@@ -11,8 +11,7 @@ mod device_list;
 mod microphone;
 mod speakers;
 
-use device_list::SoundDevice;
-
 pub(crate) use device_list::device_list;
+use device_list::SoundDevice;
 pub(super) use microphone::{Microphone, MicrophoneStream};
 pub(super) use speakers::{Speakers, SpeakersSink};
diff --git a/src/ffi/linux/ffi.rs b/src/ffi/linux/ffi.rs
@@ -12,11 +12,10 @@ mod microphone;
 mod speakers;
 
 // Implementation Expectations:
+pub(crate) use asound::device_list::device_list;
 use asound::{
     device_list::{open, pcm_hw_params, AudioDevice, SoundDevice, DEFAULT},
     PollFd, SndPcmAccess, SndPcmFormat, SndPcmMode, SndPcmState, SndPcmStream,
 };
-
-pub(crate) use asound::device_list::device_list;
 pub(crate) use microphone::{Microphone, MicrophoneStream};
 pub(crate) use speakers::{Speakers, SpeakersSink};
diff --git a/src/ffi/linux/microphone.rs b/src/ffi/linux/microphone.rs
@@ -220,7 +220,7 @@ impl Future for Microphone {
                     -77 => {
                         eprintln!(
                             "Incorrect state (-EBADFD): Report Bug to \
-                        https://github.com/libcala/wavy/issues/new"
+                        https://github.com/ardaku/wavy/issues/new"
                         );
                         unreachable!()
                     }
@@ -236,7 +236,7 @@ impl Future for Microphone {
                             st => {
                                 eprintln!(
                                 "Incorrect state = {:?} (XRUN): Report Bug \
-                            to https://github.com/libcala/wavy/issues/new",
+                            to https://github.com/ardaku/wavy/issues/new",
                                 st
                             );
                                 unreachable!()

diff --git a/src/ffi/linux/pcm.rs b/src/ffi/linux/pcm.rs
@@ -15,10 +15,13 @@ use std::{
     os::raw::{c_char, c_int, c_uint, c_void},
 };
 
-use super::super::{
-    PollFd, SndPcmAccess, SndPcmFormat, SndPcmMode, SndPcmState, SndPcmStream,
+use super::{
+    super::{
+        PollFd, SndPcmAccess, SndPcmFormat, SndPcmMode, SndPcmState,
+        SndPcmStream,
+    },
+    ALSA,
 };
-use super::ALSA;
 
 pub(crate) unsafe fn hw_params_set_period_size_near(
     pcm: *mut c_void,

diff --git a/src/ffi/linux/speakers.rs b/src/ffi/linux/speakers.rs
@@ -256,7 +256,7 @@ impl Future for Speakers {
                             st => {
                                 eprintln!(
                             "Incorrect state = {:?} (XRUN): Report Bug to \
-                             https://github.com/libcala/wavy/issues/new",
+                             https://github.com/ardaku/wavy/issues/new",
                             st
                         );
                                 unreachable!()
@@ -266,7 +266,7 @@ impl Future for Speakers {
                     -77 => {
                         eprintln!(
                             "Incorrect state (-EBADFD): Report Bug to \
-                         https://github.com/libcala/wavy/issues/new"
+                         https://github.com/ardaku/wavy/issues/new"
                         );
                         unreachable!()
                     }

diff --git a/src/ffi/macos/ffi.rs b/src/ffi/macos/ffi.rs
@@ -11,8 +11,7 @@ mod device_list;
 mod microphone;
 mod speakers;
 
-use device_list::SoundDevice;
-
 pub(crate) use device_list::device_list;
+use device_list::SoundDevice;
 pub(super) use microphone::{Microphone, MicrophoneStream};
 pub(super) use speakers::{Speakers, SpeakersSink};
diff --git a/src/ffi/mod.rs b/src/ffi/mod.rs
@@ -9,5 +9,5 @@
 
 compile_error!(
     "Target os not supported, please open an issue at \
-    https://github.com/libcala/wavy/issues"
+    https://github.com/ardaku/wavy/issues"
 );
diff --git a/src/ffi/wasm/ffi.rs b/src/ffi/wasm/ffi.rs
@@ -145,8 +145,7 @@ mod device_list;
 mod microphone;
 mod speakers;
 
-use device_list::SoundDevice;
-
 pub(crate) use device_list::device_list;
+use device_list::SoundDevice;
 pub(super) use microphone::{Microphone, MicrophoneStream};
 pub(super) use speakers::{Speakers, SpeakersSink};
diff --git a/src/lib.rs b/src/lib.rs
@@ -70,8 +70,8 @@
 //! ```
 
 #![doc(
-    html_logo_url = "https://libcala.github.io/logo.svg",
-    html_favicon_url = "https://libcala.github.io/icon.svg",
+    html_logo_url = "https://ardaku.github.io/mm/logo.svg",
+    html_favicon_url = "https://ardaku.github.io/mm/icon.svg",
     html_root_url = "https://docs.rs/wavy"
 )]
 #![deny(unsafe_code)]