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

Upgrades and stuff - #35

Merged
bors[bot] merged 4 commits into
assert-rs:masterfrom
epage:cleanup
Sep 14, 2017
Merged

Upgrades and stuff#35
bors[bot] merged 4 commits into
assert-rs:masterfrom
epage:cleanup

Conversation

@epage

@epageepage commented Sep 9, 2017

Copy link
Copy Markdown
Collaborator

Dependencies

  • Upgrade dependencies
  • Remove reliance on rustc_serialize

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

@epage

epage commented Sep 9, 2017

Copy link
Copy Markdown
CollaboratorAuthor

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

killercup
killercup approved these changes Sep 11, 2017
View reviewed changes

@killercupkillercup left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Thanks!

bors r+

Comment threadCargo.toml

[dev-dependencies]
skeptic = "0.5"
skeptic = "0.13"

@killercupkillercupSep 11, 2017

Copy link
Copy Markdown
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! :)

Comment threadCargo.toml Outdated
difference = "1.0"
error-chain = "0.11"
rustc-serialize = "0.3"
json = "0.11"

@killercupkillercupSep 11, 2017

Copy link
Copy Markdown
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.

@epageepageSep 11, 2017

Copy link
Copy Markdown
CollaboratorAuthor

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.

@epageepageSep 13, 2017

Copy link
Copy Markdown
CollaboratorAuthor

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

borsBot commented Sep 11, 2017

Copy link
Copy Markdown
Contributor

Merge conflict (retrying...)

@killercupkillercup mentioned this pull request Sep 11, 2017
Merged
borsBot added a commit that referenced this pull request Sep 11, 2017
@bors
Merge#35
ae7dd20
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

borsBot commented Sep 11, 2017

Copy link
Copy Markdown
Contributor

Timed out

@epageepage mentioned this pull request Sep 12, 2017
Closed
@killercup

killercup commented Sep 13, 2017

Copy link
Copy Markdown
Collaborator

bors r+

@bors

borsBot commented Sep 13, 2017

Copy link
Copy Markdown
Contributor

Merge conflict

@epage
Add negative versions of string matches
9246751
- `.doesnt_print`, `.doesnt_print_exactly`
- `.doesnt_print_error`, `.doesnt_print_error_exactly`
Fixesassert-rs#31
@epage
Split assert code into distinct module
69c8c85
@epage
Upgrade dependencies
0404ec0
@epage

epage commented Sep 14, 2017

Copy link
Copy Markdown
CollaboratorAuthor

I wonder if I can do it

bors r+

@bors

borsBot commented Sep 14, 2017

Copy link
Copy Markdown
Contributor

🔒 Permission denied

Existing reviewers: click here to make epage a reviewer

@epage

epage commented Sep 14, 2017

Copy link
Copy Markdown
CollaboratorAuthor

Ah, I take it bors auto-merges

@killercup

killercup commented Sep 14, 2017

Copy link
Copy Markdown
Collaborator

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

bors r+

borsBot added a commit that referenced this pull request Sep 14, 2017
@bors
Merge#35
0618fd2
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

borsBot commented Sep 14, 2017

Copy link
Copy Markdown
Contributor

Build succeeded

@bors
borsBot merged commit 433bbc2 into assert-rs:masterSep 14, 2017
@killercupkillercup mentioned this pull request Sep 14, 2017
Closed
@epage
epage deleted the cleanup branch September 14, 2017 19:26
@epageepage mentioned this pull request Sep 14, 2017
Merged
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer
@killercupkillercupkillercup approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@epage@killercup