Skip to content

fix: update enum usage after Falliable - Fallible rename #1959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Olexandr88 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: update enum usage after Falliable - Fallible rename #1959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wayland/dmabuf/dispatch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ where
params.clone(),
dh.clone(),
dmabuf.clone(),
Import::Falliable,
Import::Fallible,
);
state.dmabuf_imported(&DmabufGlobal { id: data.id }, dmabuf, notifier);
} else {
Expand Down
6 changes: 3 additions & 3 deletions src/wayland/dmabuf/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ pub struct ImportNotifier {
#[derive(Debug)]
enum Import {
/// The import can fail or create a WlBuffer.
Falliable,
Fallible,

/// A WlBuffer object has already been created. Failure causes client death.
Infallible(WlBuffer),
Expand All @@ -889,7 +889,7 @@ impl ImportNotifier {
let client = self.inner.client();

let result = match self.import {
Import::Falliable => {
Import::Fallible => {
if let Some(client) = client {
match client.create_resource::<wl_buffer::WlBuffer, Dmabuf, D>(
&self.display,
Expand Down Expand Up @@ -955,7 +955,7 @@ impl ImportNotifier {

/// Import failed for an implementation dependent reason.
pub fn failed(mut self) {
if matches!(self.import, Import::Falliable) {
if matches!(self.import, Import::Fallible) {
self.inner.failed();
} else {
self.inner.post_error(
Expand Down
Loading