Skip to content

Commit

Permalink
Merge pull request #746 from gwenn/clipboard-win
Browse files Browse the repository at this point in the history
Bump clipboard-win to version 5.0
  • Loading branch information
gwenn authored Nov 22, 2023
2 parents 486e9fa + 61bcac5 commit 77f1d53
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ signal-hook = { version = "0.3", optional = true, default-features = false }
termios = { version = "0.3.3", optional = true }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["consoleapi", "handleapi", "synchapi", "minwindef", "processenv", "std", "winbase", "wincon", "winuser"] }
winapi = { version = "0.3", features = ["consoleapi", "handleapi", "synchapi", "minwindef", "processenv", "std", "winbase", "wincon", "winerror", "winuser"] }
scopeguard = "1.1"
clipboard-win = "4.5"
clipboard-win = "5.0"

[dev-dependencies]
doc-comment = "0.3"
Expand Down
6 changes: 3 additions & 3 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub enum ReadlineError {
Decode(char::DecodeUtf16Error),
/// Something went wrong calling a Windows API
#[cfg(windows)]
SystemError(clipboard_win::SystemError),
SystemError(clipboard_win::ErrorCode),
/// Error related to SQLite history backend
#[cfg(feature = "with-sqlite-history")]
SQLiteError(rusqlite::Error),
Expand Down Expand Up @@ -133,8 +133,8 @@ impl From<fmt::Error> for ReadlineError {
}

#[cfg(windows)]
impl From<clipboard_win::SystemError> for ReadlineError {
fn from(err: clipboard_win::SystemError) -> Self {
impl From<clipboard_win::ErrorCode> for ReadlineError {
fn from(err: clipboard_win::ErrorCode) -> Self {
ReadlineError::SystemError(err)
}
}
Expand Down

0 comments on commit 77f1d53

Please sign in to comment.