Skip to content
This repository was archived by the owner on Dec 29, 2021. It is now read-only.

Upgrades and stuff #35

Merged
merged 4 commits into from
Sep 14, 2017
Merged

Upgrades and stuff #35

merged 4 commits into from
Sep 14, 2017

Conversation

epage
Copy link
Collaborator

@epage epage commented Sep 9, 2017

Dependencies

  • Upgrade dependencies
  • Remove reliance on rustc_serialize

Otherwise, I moved Assert into its own module in prep for future refactorings.

@epage
Copy link
Collaborator Author

epage commented Sep 9, 2017

This includes #34, will rebase once that is merged.

Copy link
Collaborator

@killercup killercup left a comment

Choose a reason for hiding this comment

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

Thanks!

bors r+


[dev-dependencies]
skeptic = "0.5"
skeptic = "0.13"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Wow, that's a big jump from 0.5 to 0.13! :)

Cargo.toml Outdated
@@ -16,7 +16,7 @@ build = "build.rs"
colored = "1.5"
difference = "1.0"
error-chain = "0.11"
rustc-serialize = "0.3"
json = "0.11"
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'd usually prefer to use serde_json everywhere, but it's fine to go with this crate here as it does what we need it to do and also has no dependencies.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I went with it for that and because I thought serde_json was implemented in terms of it which I just found out it isn't.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I've gone ahead and switched it to serde_json (already shows up in the dependency tree anyways).

@bors
Copy link
Contributor

bors bot commented Sep 11, 2017

Merge conflict (retrying...)

bors bot added a commit that referenced this pull request Sep 11, 2017
35: Upgrades and stuff r=killercup a=epage

Dependencies
- Upgrade dependencies
- Remove reliance on rustc_serialize

Otherwise, I moved Assert into its own module in prep for future refactorings.
@bors
Copy link
Contributor

bors bot commented Sep 11, 2017

Timed out

@killercup
Copy link
Collaborator

bors r+

@bors
Copy link
Contributor

bors bot commented Sep 13, 2017

Merge conflict

- `.doesnt_print`, `.doesnt_print_exactly`
- `.doesnt_print_error`, `.doesnt_print_error_exactly`

Fixes assert-rs#31
@epage
Copy link
Collaborator Author

epage commented Sep 14, 2017

I wonder if I can do it

bors r+

@bors
Copy link
Contributor

bors bot commented Sep 14, 2017

🔒 Permission denied

Existing reviewers: click here to make epage a reviewer

@epage
Copy link
Collaborator Author

epage commented Sep 14, 2017

Ah, I take it bors auto-merges

@killercup
Copy link
Collaborator

I added you as a collaborator on github and with bors! In the meantime, let's give this another try:

bors r+

bors bot added a commit that referenced this pull request Sep 14, 2017
35: Upgrades and stuff r=killercup a=epage

Dependencies
- Upgrade dependencies
- Remove reliance on rustc_serialize

Otherwise, I moved Assert into its own module in prep for future refactorings.
@bors
Copy link
Contributor

bors bot commented Sep 14, 2017

Build succeeded

@bors bors bot merged commit 433bbc2 into assert-rs:master Sep 14, 2017
@epage epage deleted the cleanup branch September 14, 2017 19:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants