diff options
| author | Joe Wilm <jwilm@users.noreply.github.com> | 2017-01-06 21:51:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 21:51:24 -0800 |
| commit | 852c2d8f15bfc11f0222fa08626c38724accd35a (patch) | |
| tree | 0880b8e38d76ae4ba0fb1772fbd11cae53168729 /src/config.rs | |
| parent | 62739bd226974358a811b4680b4b74c268418f5b (diff) | |
| parent | 4e1f4c8cd7180606156b71ad0222f60e4559f2b3 (diff) | |
| download | r-alacritty-852c2d8f15bfc11f0222fa08626c38724accd35a.tar.gz r-alacritty-852c2d8f15bfc11f0222fa08626c38724accd35a.tar.bz2 r-alacritty-852c2d8f15bfc11f0222fa08626c38724accd35a.zip | |
Merge pull request #131 from Manishearth/stable
Make it compile on stable Rust (almost)
Diffstat (limited to 'src/config.rs')
| -rw-r--r-- | src/config.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/config.rs b/src/config.rs index 36f0c363..f36859c7 100644 --- a/src/config.rs +++ b/src/config.rs @@ -713,7 +713,8 @@ fn rgb_from_hex<D>(deserializer: &mut D) -> ::std::result::Result<Rgb, D::Error> deserializer.deserialize_str(RgbVisitor) } -impl Rgb { +impl FromStr for Rgb { + type Err = (); fn from_str(s: &str) -> ::std::result::Result<Rgb, ()> { let mut chars = s.chars(); let mut rgb = Rgb::default(); |