TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-01 20:41:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate build warnings from the Scrap crate (#13383)

Browse Source 
* Updated build.rs to tell RustC that dxgi, quartz and x11 are expected configurations.
Added lifetime annotations to various methods in common/aom.rs and common/vpxcodec.rs.
Updated common/vpx.rs to allow unused_imports in the generated bindings.
Updated dxgi/mag.rs to allow non_snake_case identifiers like "dwFilterMode".

* Added lifetime annotations to methods in common/hwcodec.rs and common/vram.rs.

* Switched syntax for the rustc-check-cfg directive emitted by build.rs in the scrap crate to use syntax compatible with Rust toolchain version 1.75. The double-colon syntax requires 1.77 or newer, but the older single-colon syntax works fine on newer versions for this directive.

* Update libs/scrap/build.rs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Revert apparently-erroneous AI suggestion. It's usually pretty good, but not always right it seems. :-)

This reverts commit bf862b13f6.

* Removed redundant configuration directives from libs/scrap/build.rs.

---------

Co-authored-by: RustDesk <71636191+rustdesk@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Jonathan Gilbert
2025-11-03 20:19:13 -06:00
committed by GitHub
parent b75f4daa47
commit a903f710ea
7 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libs/scrap/build.rs
View File

@@ -227,24 +227,12 @@ fn ffmpeg() {
*/
fn main() {
// in this crate, these are also valid configurations
println!("cargo:rustc-check-cfg=cfg(dxgi,quartz,x11)");
// there is problem with cfg(target_os) in build.rs, so use our workaround
let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
// We check if is macos, because macos uses rust 1.8.1.
// `cargo::rustc-check-cfg` is new with Cargo 1.80.
// No need to run `cargo version` to get the version here, because:
// The following lines are used to suppress the lint warnings.
// warning: unexpected `cfg` condition name: `quartz`
if cfg!(target_os = "macos") {
if target_os != "ios" {
println!("cargo::rustc-check-cfg=cfg(android)");
println!("cargo::rustc-check-cfg=cfg(dxgi)");
println!("cargo::rustc-check-cfg=cfg(quartz)");
println!("cargo::rustc-check-cfg=cfg(x11)");
// ^^^^^^^^^^^^^^^^^^^^^^ new with Cargo 1.80
}
}
// note: all link symbol names in x86 (32-bit) are prefixed wth "_".
// run "rustup show" to show current default toolchain, if it is stable-x86-pc-windows-msvc,
// please install x64 toolchain by "rustup toolchain install stable-x86_64-pc-windows-msvc",