Swap to rust 2021 edition and move rustc version check from meson.build to Cargo.toml

This commit is contained in:
Tom A. Wagner
2021-11-23 20:19:43 +01:00
parent 82a3e4f900
commit eac973da15
2 changed files with 2 additions and 7 deletions

View File

@@ -2,7 +2,8 @@
name = "helvum" name = "helvum"
version = "0.3.1" version = "0.3.1"
authors = ["Tom A. Wagner <tom.a.wagner@protonmail.com>"] authors = ["Tom A. Wagner <tom.a.wagner@protonmail.com>"]
edition = "2018" edition = "2021"
rust-version = "1.56"
license = "GPL-3.0-only" license = "GPL-3.0-only"
description = "A GTK patchbay for pipewire" description = "A GTK patchbay for pipewire"
repository = "https://gitlab.freedesktop.org/ryuukyu/helvum" repository = "https://gitlab.freedesktop.org/ryuukyu/helvum"

View File

@@ -12,12 +12,6 @@ dependency('glib-2.0', version: '>= 2.48')
dependency('gtk4', version: '>= 4.0.0') dependency('gtk4', version: '>= 4.0.0')
dependency('libpipewire-0.3') dependency('libpipewire-0.3')
rust_version = meson.get_compiler('rust').version()
min_rust_version = '1.54.0'
if rust_version < min_rust_version
error('Rust version too old: Required version is ' + min_rust_version + ' but actual version is ' + rust_version)
endif
desktop_file_validate = find_program('desktop-file-validate', required: false) desktop_file_validate = find_program('desktop-file-validate', required: false)
cargo = find_program('cargo', required: true) cargo = find_program('cargo', required: true)
cargo_script = find_program('build-aux/cargo.sh') cargo_script = find_program('build-aux/cargo.sh')