Skip to content

Commit

Permalink
Rollup merge of rust-lang#53476 - GuillaumeGomez:try-from-int-error-p…
Browse files Browse the repository at this point in the history
…artial-eq, r=KodrAus

Add partialeq implementation for TryFromIntError type

Fixes rust-lang#53458.
  • Loading branch information
pietroalbini authored Aug 30, 2018
2 parents ba83270 + da4febd commit a245d9b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/libcore/num/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4323,7 +4323,7 @@ from_str_radix_int_impl! { isize i8 i16 i32 i64 i128 usize u8 u16 u32 u64 u128 }

/// The error type returned when a checked integral type conversion fails.
#[unstable(feature = "try_from", issue = "33417")]
#[derive(Debug, Copy, Clone)]
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub struct TryFromIntError(());

impl TryFromIntError {
Expand Down
21 changes: 21 additions & 0 deletions src/test/run-pass/try-from-int-error-partial-eq.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(try_from)]
#![allow(unused_must_use)]

use std::convert::TryFrom;
use std::num::TryFromIntError;

fn main() {
let x: u32 = 125;
let y: Result<u8, TryFromIntError> = u8::try_from(x);
y == Ok(125);
}

0 comments on commit a245d9b

Please sign in to comment.