leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only build, but don't run tests in MSRV CI (#2558)

Browse source 
* Only build, but don't run tests in MSRV CI

Since the MSRV of development dependencies can easily be bumped without it affecting the MSRV of the published version of `winit`

* Run clippy on stable Rust instead of MSRV Rust

clippy inspects the `rust-version` field, and only suggests changes that conform to that.
This commit is contained in:
Mads Marquart 2022-11-23 13:07:58 +01:00 • committed by GitHub
parent bdcbd7d1f9
commit ce6c6e8c95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 72 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/platform_impl/linux/x11/ime/callbacks.rs
View file

@ -72,7 +72,8 @@ pub unsafe fn set_destroy_callback(
#[derive(Debug)]
#[allow(clippy::enum_variant_names)]
enum ReplaceImError {
MethodOpenFailed(PotentialInputMethods),
// Boxed to prevent large error type
MethodOpenFailed(Box<PotentialInputMethods>),
ContextCreationFailed(ImeContextCreationError),
SetDestroyCallbackFailed(XError),
}
@ -88,7 +89,7 @@ unsafe fn replace_im(inner: *mut ImeInner) -> Result<(), ReplaceImError> {
let is_fallback = new_im.is_fallback();
(
new_im.ok().ok_or_else(|| {
ReplaceImError::MethodOpenFailed((*inner).potential_input_methods.clone())
ReplaceImError::MethodOpenFailed(Box::new((*inner).potential_input_methods.clone()))
})?,
is_fallback,
)

9
src/platform_impl/linux/x11/ime/mod.rs
View file

@ -46,7 +46,8 @@ pub enum ImeRequest {
#[derive(Debug)]
pub enum ImeCreationError {
OpenFailure(PotentialInputMethods),
// Boxed to prevent large error type
OpenFailure(Box<PotentialInputMethods>),
SetDestroyCallbackFailed(XError),
}
@ -90,7 +91,7 @@ impl Ime {
if let Some(input_method) = input_method.ok() {
inner.is_fallback = is_fallback;
unsafe {
let result = set_destroy_callback(&xconn, input_method.im, &*inner)
let result = set_destroy_callback(&xconn, input_method.im, &inner)
.map_err(ImeCreationError::SetDestroyCallbackFailed);
if result.is_err() {
let _ = close_im(&xconn, input_method.im);
@ -100,7 +101,9 @@ impl Ime {
inner.im = Some(input_method);
Ok(Ime { xconn, inner })
} else {
Err(ImeCreationError::OpenFailure(inner.potential_input_methods))
Err(ImeCreationError::OpenFailure(Box::new(
inner.potential_input_methods,
)))
}
}