Skip to content

bump quickcheck to 0.5 #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 1, 2017
Merged

Conversation

ignatenkobrain
Copy link
Contributor

Signed-off-by: Igor Gnatenko [email protected]

@ignatenkobrain
Copy link
Contributor Author

Seems it is not that trivial...

@BurntSushi
Copy link
Member

@ignatenkobrain You're really on top of things! But yeah, there might be some breaking changes that need to be fixed.

@ignatenkobrain
Copy link
Contributor Author

error[E0308]: mismatched types

   --> regex-syntax/src/properties.rs:194:51

    |

194 |                                       e: Box::new(e),

    |                                                   ^ expected enum `Expr`, found struct `std::boxed::Box`

    |

    = note: expected type `Expr`

               found type `std::boxed::Box<Expr>`

error[E0271]: type mismatch resolving `<[closure@regex-syntax/src/properties.rs:193:40: 197:36 i:_, name:_] as std::ops::FnOnce<(std::boxed::Box<Expr>,)>>::Output == std::boxed::Box<Expr>`

   --> regex-syntax/src/properties.rs:192:28

    |

192 |                           .chain(e.clone().shrink()

    |                            ^^^^^ expected enum `Expr`, found struct `std::boxed::Box`

    |

    = note: expected type `Expr`

               found type `std::boxed::Box<Expr>`

    = note: required because of the requirements on the impl of `std::iter::Iterator` for `std::iter::Map<std::boxed::Box<std::iter::Iterator<Item=std::boxed::Box<Expr>>>, [closure@regex-syntax/src/properties.rs:193:40: 197:36 i:_, name:_]>`

error[E0271]: type mismatch resolving `<std::iter::Chain<std::boxed::Box<std::iter::Iterator<Item=std::boxed::Box<Expr>>>, std::iter::Map<std::boxed::Box<std::iter::Iterator<Item=std::boxed::Box<Expr>>>, [closure@regex-syntax/src/properties.rs:193:40: 197:36 i:_, name:_]>> as std::iter::Iterator>::Item == Expr`

   --> regex-syntax/src/properties.rs:191:17

    |

191 | /                 Box::new(e.clone().shrink()

192 | |                           .chain(e.clone().shrink()

193 | |                                   .map(move |e| Group {

194 | |                                       e: Box::new(e),

195 | |                                       i: i.clone(),

196 | |                                       name: name.clone(),

197 | |                                   })))

    | |______________________________________^ expected struct `std::boxed::Box`, found enum `Expr`

    |

    = note: expected type `std::boxed::Box<Expr>`

               found type `Expr`

    = note: required for the cast to the object type `std::iter::Iterator<Item=Expr>`

error[E0271]: type mismatch resolving `<[closure@regex-syntax/src/properties.rs:193:40: 197:36 i:_, name:_] as std::ops::FnOnce<(std::boxed::Box<Expr>,)>>::Output == std::boxed::Box<Expr>`

   --> regex-syntax/src/properties.rs:191:17

    |

191 | /                 Box::new(e.clone().shrink()

192 | |                           .chain(e.clone().shrink()

193 | |                                   .map(move |e| Group {

194 | |                                       e: Box::new(e),

195 | |                                       i: i.clone(),

196 | |                                       name: name.clone(),

197 | |                                   })))

    | |______________________________________^ expected enum `Expr`, found struct `std::boxed::Box`

    |

    = note: expected type `Expr`

               found type `std::boxed::Box<Expr>`

    = note: required because of the requirements on the impl of `std::iter::Iterator` for `std::iter::Map<std::boxed::Box<std::iter::Iterator<Item=std::boxed::Box<Expr>>>, [closure@regex-syntax/src/properties.rs:193:40: 197:36 i:_, name:_]>`

    = note: required because of the requirements on the impl of `std::iter::Iterator` for `std::iter::Chain<std::boxed::Box<std::iter::Iterator<Item=std::boxed::Box<Expr>>>, std::iter::Map<std::boxed::Box<std::iter::Iterator<Item=std::boxed::Box<Expr>>>, [closure@regex-syntax/src/properties.rs:193:40: 197:36 i:_, name:_]>>`

    = note: required for the cast to the object type `std::iter::Iterator<Item=Expr>`

error: aborting due to 4 previous errors

Not entirely sure how to fix it... yet.

@ignatenkobrain ignatenkobrain changed the title bump quickcheck to 0.5 [WIP] bump quickcheck to 0.5 Nov 29, 2017
@BurntSushi
Copy link
Member

That looks suspicious. I'll try to investigate later today.

@ignatenkobrain
Copy link
Contributor Author

@BurntSushi I give up, have no idea why it doesn't work.

@BurntSushi
Copy link
Member

I'll check it out when I get a chance. Thanks for trying! It is quite interesting that Windows CI passed...

@ignatenkobrain
Copy link
Contributor Author

Just some hint: it started to happen after BurntSushi/quickcheck@6c96290

@BurntSushi
Copy link
Member

Oh hmm yeah, that's from this PR, which we noted as a breaking change: BurntSushi/quickcheck#154

Signed-off-by: Igor Gnatenko <[email protected]>
@ignatenkobrain
Copy link
Contributor Author

@BurntSushi @cuviper wrote patch which I committed. Should work just fine.

Also he pointed out that clone() is not necessary and could be replaced by: *e.clone() -> **e. Not sure if I should go with this option because I see clone() everywhere in the code.

@BurntSushi
Copy link
Member

@ignatenkobrain Interesting, thanks for the fix! The extra clone is fine even if it isn't necessary, this is just test code after all.

@bors r+

@bors
Copy link
Contributor

bors commented Nov 30, 2017

📋 Looks like this PR is still in progress, ignoring approval

@BurntSushi
Copy link
Member

@bors retry

@ignatenkobrain ignatenkobrain changed the title [WIP] bump quickcheck to 0.5 bump quickcheck to 0.5 Nov 30, 2017
@ignatenkobrain
Copy link
Contributor Author

@bors r=BurntSushi

@bors
Copy link
Contributor

bors commented Nov 30, 2017

@ignatenkobrain: 🔑 Insufficient privileges: Not in reviewers

@BurntSushi
Copy link
Member

C'mon bors! @bors r+

@bors
Copy link
Contributor

bors commented Nov 30, 2017

📌 Commit f2ced64 has been approved by BurntSushi

bors added a commit that referenced this pull request Nov 30, 2017
bump quickcheck to 0.5

Signed-off-by: Igor Gnatenko <[email protected]>
@bors
Copy link
Contributor

bors commented Nov 30, 2017

⌛ Testing commit f2ced64 with merge b9cb447...

@BurntSushi
Copy link
Member

@ignatenkobrain Oh interesting. Did bors pick up on the "WIP" in the issue title? Cute.

@bors
Copy link
Contributor

bors commented Dec 1, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: BurntSushi
Pushing b9cb447 to master...

@bors bors merged commit f2ced64 into rust-lang:master Dec 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants