Skip to content
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

Update toml, regex and xml-rs version #320

Merged
merged 5 commits into from
Mar 4, 2017
Merged

Conversation

EPashkin
Copy link
Member

@EPashkin EPashkin commented Mar 2, 2017

Updating to new last toml as rustc-serialize planed for deprecation https://internals.rust-lang.org/t/rust-release-milestone-predictions/4591
Only last is docopt that also planing use serde docopt/docopt.rs#128

PS. There was problem with sys crates toml-rs/toml-rs#151
PPS. When upgrading found that regex 0.2.0 don't implement Eq so this code fails and upgrade will need other PR later (if any).

#[derive(Clone, Debug, Eq, PartialEq)]
pub enum Ident {
    Name(String),
    Pattern(Regex),
}

@EPashkin
Copy link
Member Author

EPashkin commented Mar 2, 2017

Fixed regex update

@EPashkin EPashkin changed the title Update toml to 0.3 Update toml to 0.3 and regex to 0.2 Mar 2, 2017
@EPashkin EPashkin changed the title Update toml to 0.3 and regex to 0.2 Update toml, regex and xml-rs version Mar 3, 2017
@EPashkin
Copy link
Member Author

EPashkin commented Mar 3, 2017

Upgraded xml-rs

@EPashkin
Copy link
Member Author

EPashkin commented Mar 3, 2017

@GuillaumeGomez I merge PR tomorrow if you do not see the problems

Cargo.toml Outdated
@@ -11,7 +11,7 @@ exclude = ["Gir*.toml", "tests/**/*", "*.md"]

[dependencies]
docopt = "*"
xml-rs = "0.2.1"
xml-rs = "*"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm clearly not a big fan of this. Also, we won't be able to publish we use '*' (even if we don't care).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to "0.2" and add version for others *?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes please. At least we'll have a bit more control over dependencies.

@GuillaumeGomez
Copy link
Member

Except for my comment, I'm 100% 👍

@EPashkin
Copy link
Member Author

EPashkin commented Mar 3, 2017

Done.
Also upgraded git2 with removing unneeded features

@EPashkin
Copy link
Member Author

EPashkin commented Mar 3, 2017

Not sure that we really needed same build-dependencies

@EPashkin
Copy link
Member Author

EPashkin commented Mar 3, 2017

Was wrong about build-dependencies forgot that it

@GuillaumeGomez
Copy link
Member

Ok. So like I said, it's good for me. Merge when you want to.

@EPashkin
Copy link
Member Author

EPashkin commented Mar 3, 2017

Removed unneeded into_owned
Will merge tomorrow

@EPashkin EPashkin merged commit c3b4020 into gtk-rs:master Mar 4, 2017
@EPashkin EPashkin deleted the toml_0_3 branch March 4, 2017 05:48
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.

2 participants