Skip to content

Commit

Permalink
Fix a nightly warning, bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
osa1 committed Dec 22, 2018
1 parent eaf55ab commit 2c95801
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# WIP
# 2018/12/22: 0.4.4

- A bug when using an invalid nick in `/msg` command fixed (#111).
- Bumped native-tls dependency -- fixes build for newer OpenSSLs (#114).
- A bug when sending multi-line text (via C-x or pasting) fixed (#113).
- Update to `C-x` (paste mode): empty lines are now sent as a space (" ").
Useful when e.g. sending long text with multiple paragraphs (#112).
- Fixed deprecation warnings for nightly.

# 2018/09/01: 0.4.3

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tiny"
version = "0.4.3"
version = "0.4.4"
authors = ["Ömer Sinan Ağacan <[email protected]>"]
repository = "https://github.com/osa1/tiny"
readme = "README.md"
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ fn find_conn_idx(conns: &[Conn], serv_name: &str) -> Option<usize> {
}

fn connect_err_msg(err: &ConnErr) -> String {
match err.cause() {
match err.source() {
Some(other_err) =>
format!("Connection error: {} ({})", err.description(), other_err.description()),
None =>
Expand All @@ -954,7 +954,7 @@ fn connect_err_msg(err: &ConnErr) -> String {
}

fn reconnect_err_msg(err: &ConnErr) -> String {
match err.cause() {
match err.source() {
Some(other_err) =>
format!(
"Connection error: {} ({}). \
Expand Down
6 changes: 3 additions & 3 deletions src/stream/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ impl StreamErr {
}
}

pub fn cause(&self) -> Option<&error::Error> {
pub fn source(&self) -> Option<&error::Error> {
use self::StreamErr::*;
match *self {
IoError(ref err) =>
err.cause(),
err.source(),
CantResolveAddr =>
None,
TlsError(ref err) =>
err.cause(),
err.source(),
ConnectionClosed =>
None,
}
Expand Down

0 comments on commit 2c95801

Please sign in to comment.