yaahc/eyre - Change ZWBKKVT5TX2CSMBVEYZMQ6DLCXVHSD7SWFEKXWK6XKD6RP24MJJAC

Consolidate to one Context impl for Result to improve inference

Created by David Tolnay on October 11, 2019

ZWBKKVT5TX2CSMBVEYZMQ6DLCXVHSD7SWFEKXWK6XKD6RP24MJJAC

Dependencies

In channels

main

Change contents

Replacement in src/context.rs at line 68 [5.642]

B:BD[5.1186] → [6.183:390]

B:BD[6.390] → [2.0:74]

impl<T, E> Context<T, E> for Result<T, E>
where
    E: StdError + Send + Sync + 'static,
{
    fn context<C>(self, context: C) -> Result<T, Error>
    where
        C: Display + Send + Sync + 'static,
    {
        self.map_err(|error| Error::new(ContextError { error, context }))

[5.1186]

[5.1435]

mod ext {
    use super::*;
    pub trait StdError {
        fn ext_context<C>(self, context: C) -> Error
        where
            C: Display + Send + Sync + 'static;

Replacement in src/context.rs at line 77 [5.642]

B:BD[5.1442] → [7.0:64]

    fn with_context<C, F>(self, context: F) -> Result<T, Error>

[5.1442]

[8.174]

    impl<E> StdError for E

Replacement in src/context.rs at line 79 [5.642]
∅:D[8.184] → [5.1510:1554]
B:BD[5.1510] → [5.1510:1554]
B:BD[5.1554] → [9.27:53]
```
        C: Display + Send + Sync + 'static,
        F: FnOnce() -> C,
```
[8.184]
[5.1581]
```
        E: std::error::Error + Send + Sync + 'static,
```

Replacement in src/context.rs at line 81 [5.642]

B:BD[5.1587] → [8.214:245]

        self.map_err(|error| {

[5.1587]

[2.75]

        fn ext_context<C>(self, context: C) -> Error
        where
            C: Display + Send + Sync + 'static,
        {

Replacement in src/context.rs at line 86 [5.642]

∅:D[9.84] → [8.324:347]

∅:D[2.113] → [8.324:347]

B:BD[8.324] → [8.324:347]

B:BD[8.347] → [7.65:101]

                error,
                context: context(),

[2.113]

[8.347]

                error: self,
                context,

Replacement in src/context.rs at line 89 [5.642]

B:BD[8.362] → [8.362:373]

})

[8.362]

[5.1677]

        }
    }
    impl StdError for Error {
        fn ext_context<C>(self, context: C) -> Error
        where
            C: Display + Send + Sync + 'static,
        {
            self.context(context)
        }

Replacement in src/context.rs at line 102 [5.642]

B:BD[5.1686] → [10.480:529]

impl<T> Context<T, Error> for Result<T, Error> {

[5.1686]

[6.391]

impl<T, E> Context<T, E> for Result<T, E>
where
    E: ext::StdError + Send + Sync + 'static,
{

Replacement in src/context.rs at line 110 [5.642]

B:BD[6.507] → [7.102:155]

        self.map_err(|error| error.context(context))

[6.507]

[5.1917]

        self.map_err(|error| error.ext_context(context))

Replacement in src/context.rs at line 118 [5.642]

B:BD[5.2077] → [7.221:276]

        self.map_err(|error| error.context(context()))

[5.2077]

[3.51]

        self.map_err(|error| error.ext_context(context()))

Replacement in src/context.rs at line 213 [5.642]
B:BD[4.152] → [4.152:213]
```
    use crate::Error;
    use std::error::Error as StdError;
```
[4.152]
[4.213]
```
    use super::*;
```

Replacement in src/context.rs at line 217 [5.642]

B:BD[4.239] → [4.239:366]

    impl<T, E> Sealed for Result<T, E> where E: StdError + Send + Sync + 'static {}
    impl<T> Sealed for Result<T, Error> {}

[4.239]

[4.366]

    impl<T, E> Sealed for Result<T, E> where E: ext::StdError {}