Skip to content

Commit

Permalink
Upgrade to Rust 1.81.0
Browse files Browse the repository at this point in the history
  • Loading branch information
helgoboss committed Sep 28, 2024
1 parent c57ddb1 commit a2533b2
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-armv7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/linux-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-i686.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/src/persistence/target.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<MouseButton>,
Expand Down
4 changes: 2 additions & 2 deletions base/src/channels.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ impl<T> SenderToNormalThread<T> {
///
/// - **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
Expand Down
2 changes: 1 addition & 1 deletion main/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Benjamin Klum <benjamin.klum@helgoboss.org>"]
edition = "2021"
build = "build.rs"
license = "GPL-3.0"
rust-version = "1.79.0"
rust-version = "1.81.0"
publish = false

[features]
Expand Down
2 changes: 1 addition & 1 deletion playtime-clip-engine
10 changes: 3 additions & 7 deletions pot-browser/src/pot_browser_panel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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<WidgetText>, toasts: &mut Toasts) {
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions resources/api/luau/realearn.luau
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit a2533b2

Please sign in to comment.