diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml index 4e9f9571..959e81fe 100644 --- a/.github/workflows/linux-aarch64.yml +++ b/.github/workflows/linux-aarch64.yml @@ -35,7 +35,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0 + toolchain: 1.81.0 target: aarch64-unknown-linux-gnu override: true - name: cargo test (for generating dialogs with php) diff --git a/.github/workflows/linux-armv7.yml b/.github/workflows/linux-armv7.yml index 18a7c1c8..af4d9cd7 100644 --- a/.github/workflows/linux-armv7.yml +++ b/.github/workflows/linux-armv7.yml @@ -35,7 +35,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0 + toolchain: 1.81.0 target: armv7-unknown-linux-gnueabihf override: true - name: cargo test (for generating dialogs with php) diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml index 6219dc85..864be752 100644 --- a/.github/workflows/linux-x86_64.yml +++ b/.github/workflows/linux-x86_64.yml @@ -35,7 +35,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0 + toolchain: 1.81.0 override: true - name: cargo check uses: actions-rs/cargo@v1 @@ -64,7 +64,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0 + toolchain: 1.81.0 override: true - name: cargo build uses: actions-rs/cargo@v1 @@ -96,7 +96,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0 + toolchain: 1.81.0 override: true - run: rustup component add rustfmt - name: cargo fmt @@ -127,7 +127,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0 + toolchain: 1.81.0 override: true - run: rustup component add clippy - name: cargo clippy diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml index 68502dee..245d84f8 100644 --- a/.github/workflows/macos-aarch64.yml +++ b/.github/workflows/macos-aarch64.yml @@ -32,7 +32,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0 + toolchain: 1.81.0 target: aarch64-apple-darwin override: true - name: Set SDKROOT diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml index 67fe8934..46760ecb 100644 --- a/.github/workflows/macos-x86_64.yml +++ b/.github/workflows/macos-x86_64.yml @@ -32,7 +32,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0 + toolchain: 1.81.0 override: true - name: cargo check uses: actions-rs/cargo@v1 @@ -62,7 +62,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0 + toolchain: 1.81.0 override: true - name: cargo build uses: actions-rs/cargo@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6d439cc..f368f2ad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -99,7 +99,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0-${{ matrix.toolchain-suffix }} + toolchain: 1.81.0-${{ matrix.toolchain-suffix }} target: ${{ matrix.target }} override: true # Install OS dependencies (Linux/macOS only) diff --git a/.github/workflows/windows-i686.yml b/.github/workflows/windows-i686.yml index d4a8e8a7..38761981 100644 --- a/.github/workflows/windows-i686.yml +++ b/.github/workflows/windows-i686.yml @@ -31,7 +31,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0-i686-pc-windows-msvc + toolchain: 1.81.0-i686-pc-windows-msvc target: i686-pc-windows-msvc override: true - name: cargo build diff --git a/.github/workflows/windows-x86_64.yml b/.github/workflows/windows-x86_64.yml index 72595ac7..a8cc110d 100644 --- a/.github/workflows/windows-x86_64.yml +++ b/.github/workflows/windows-x86_64.yml @@ -31,7 +31,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0 + toolchain: 1.81.0 override: true - name: cargo check uses: actions-rs/cargo@v1 @@ -57,7 +57,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.79.0 + toolchain: 1.81.0 override: true - name: cargo build uses: actions-rs/cargo@v1 diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 86b50092..168613b2 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -125,7 +125,7 @@ On Windows, it's necessary to use the MSVC (Microsoft Visual Studio C++) toolcha + [source,shell] ---- -rustup default 1.79.0-x86_64-pc-windows-msvc +rustup default 1.81.0-x86_64-pc-windows-msvc ---- . Download and install https://git-scm.com/download/win[Git for Windows] . Clone the ReaLearn Git repository @@ -167,7 +167,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh # choose 1 (defau source $HOME/.cargo/env # Set the correct toolchain default -rustup default 1.79.0-x86_64-unknown-linux-gnu +rustup default 1.81.0-x86_64-unknown-linux-gnu # Clone ReaLearn repository git clone https://github.com/helgoboss/helgobox.git @@ -211,7 +211,7 @@ The Rust installation script should provide you with the necessary instructions # Install Rust curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh # choose 1 (default) source $HOME/.cargo/env -rustup default 1.79.0-x86_64-apple-darwin +rustup default 1.81.0-x86_64-apple-darwin # Clone ReaLearn cd Downloads diff --git a/api/src/persistence/target.rs b/api/src/persistence/target.rs index 1d8caa17..dd3c72c9 100644 --- a/api/src/persistence/target.rs +++ b/api/src/persistence/target.rs @@ -605,7 +605,7 @@ pub enum MouseAction { /// Future extension possibilities: /// /// - Click or double-click a mouse button (press and immediate release, this could be a generic - /// "Glue" option because it could be useful for other on/off targets as well). + /// "Glue" option because it could be useful for other on/off targets as well). PressOrRelease { #[serde(skip_serializing_if = "Option::is_none")] button: Option, diff --git a/base/src/channels.rs b/base/src/channels.rs index cfa33d15..bd61c0a2 100644 --- a/base/src/channels.rs +++ b/base/src/channels.rs @@ -199,8 +199,8 @@ impl SenderToNormalThread { /// /// - **Pro:** We don't get "channel full" errors on load spikes. /// - **Con:** This can allocate when sending, so don't use this if the sender is used in - /// real-time threads! If you still do so, it will complain in debug mode because we forbid - /// allocation in real-time threads. + /// real-time threads! If you still do so, it will complain in debug mode because we forbid + /// allocation in real-time threads. /// /// We set a (very high) upper limit even for unbounded channels just to avoid memory exhaustion /// if the channel grows endlessly because of another error. This limit is not ensured by diff --git a/main/Cargo.toml b/main/Cargo.toml index 0d1756fd..f4024aca 100644 --- a/main/Cargo.toml +++ b/main/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Benjamin Klum "] edition = "2021" build = "build.rs" license = "GPL-3.0" -rust-version = "1.79.0" +rust-version = "1.81.0" publish = false [features] diff --git a/playtime-clip-engine b/playtime-clip-engine index 5078d302..bd6c109c 160000 --- a/playtime-clip-engine +++ b/playtime-clip-engine @@ -1 +1 @@ -Subproject commit 5078d302a2c2922ee04e5da66d55e0ea3cb75581 +Subproject commit bd6c109c325a04cf429f1fb6941d06a5a11b629b diff --git a/pot-browser/src/pot_browser_panel.rs b/pot-browser/src/pot_browser_panel.rs index 5cedbcaf..1c211927 100644 --- a/pot-browser/src/pot_browser_panel.rs +++ b/pot-browser/src/pot_browser_panel.rs @@ -1804,7 +1804,7 @@ fn create_product_plugin_menu(input: &mut PresetTableInput, data: &PotPresetData .plugins() .filter(|p| p.common.core.product_id == *product_id); for plugin in product_plugins { - if ui.button(&plugin.common.to_string()).clicked() { + if ui.button(plugin.common.to_string()).clicked() { let factory_preset = create_plugin_factory_preset( &plugin.common, data.preset.common.persistent_id.clone(), @@ -2913,7 +2913,7 @@ fn load_preset_and_regain_focus( } fn process_error(error: &dyn Error, toasts: &mut Toasts) { - show_error_toast(&error.to_string(), toasts); + show_error_toast(error.to_string(), toasts); } fn show_error_toast(text: impl Into, toasts: &mut Toasts) { @@ -3429,11 +3429,7 @@ const PRESET_CRAWLER_IMPORT_OR_DISCARD: &str = r#"You can now choose to import the crawled presets or discard them!"#; fn optional_string(text: Option<&str>) -> &str { - if let Some(t) = text { - t - } else { - "-" - } + text.unwrap_or("-") } fn os_document_or_reaper_resource_dir() -> Utf8PathBuf { diff --git a/resources/api/luau/realearn.luau b/resources/api/luau/realearn.luau index 401268c9..cfd33b9e 100644 --- a/resources/api/luau/realearn.luau +++ b/resources/api/luau/realearn.luau @@ -2567,7 +2567,7 @@ export type MouseAction_MoveBy = { kind: "MoveBy", axis: Axis? } --- Future extension possibilities: --- --- - Click or double-click a mouse button (press and immediate release, this could be a generic ---- "Glue" option because it could be useful for other on/off targets as well). +--- "Glue" option because it could be useful for other on/off targets as well). export type MouseAction_PressOrRelease = { kind: "PressOrRelease", button: MouseButton? } --- Scroll wheel. @@ -2634,7 +2634,7 @@ end --- Future extension possibilities: --- --- - Click or double-click a mouse button (press and immediate release, this could be a generic ---- "Glue" option because it could be useful for other on/off targets as well). +--- "Glue" option because it could be useful for other on/off targets as well). function module.MouseAction.PressOrRelease(value: { button: MouseButton? }): MouseAction_PressOrRelease local t: any = table.clone(value) t.kind = "PressOrRelease"