Skip to content

Commit 82560aa

Browse files
bug: Alias r2d2::Error as diesel::r2d2::PoolError to prevent shadowing of public rexports from r2d2 crate by diesel types.
1 parent f613f37 commit 82560aa

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ All user visible changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](http://semver.org/), as described
55
for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/text/1105-api-evolution.md)
66

7+
## [1.1.1] - 2018-01-15
8+
9+
### Added
10+
11+
* Added `diesel::r2d2::PoolError` as an alias for `r2d2::Error`. Previously this
12+
type was inaccessible due to `diesel::r2d2::Error`.
13+
714
## [1.1.0] - 2018-01-15
815

916
### Added

diesel/src/r2d2.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
extern crate r2d2;
44

55
pub use self::r2d2::*;
6+
/// A re-export of r2d2::Error, which is only used by methods on r2d2::Pool.
7+
pub type PoolError = self::r2d2::Error;
68

79
use std::convert::Into;
810
use std::fmt;

0 commit comments

Comments
 (0)