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.

Sign up for GitHub

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

Jump to bottom

Update dependencies for ignore #1705

Closed
wants to merge 1 commit into from
Closed

Update dependencies for ignore #1705

wants to merge 1 commit into from

Conversation

jyn514
Copy link

@jyn514 jyn514 commented Oct 15, 2020

  • crossbeam-channel 0.4 -> 0.5
  • crossbeam-utils 0.7 -> 0.8

This removes a duplicate dependency for cargo (previously it depended on
both 0.5 directly and 0.4 through ignore).

Let me know if I should also update dependencies for other crates, I'm happy to do so.

@jyn514
Update dependencies
e4f9b41 
- crossbeam-channel 0.4 -> 0.5
- crossbeam-utils 0.7 -> 0.8

This removes a duplicate dependency for cargo (previously it depended on
both 0.5 directly and 0.4 through `ignore`).
@jyn514
Copy link
Author

jyn514 commented Oct 15, 2020

This adds a new duplicate dependency on cfg-if 0.1 and 1.0, so you may want to wait for rust-lang/log#417 to be merged and get a release.

$ cargo tree -d
cfg-if v0.1.10
├── encoding_rs v0.8.23
│   ├── encoding_rs_io v0.1.7
│   │   └── grep-searcher v0.1.7 (/home/joshua/src/rust/ripgrep/crates/searcher)
│   │       ├── grep v0.2.7 (/home/joshua/src/rust/ripgrep/crates/grep)
│   │       │   └── ripgrep v12.1.1 (/home/joshua/src/rust/ripgrep)
│   │       └── grep-printer v0.1.5 (/home/joshua/src/rust/ripgrep/crates/printer)
│   │           └── grep v0.2.7 (/home/joshua/src/rust/ripgrep/crates/grep) (*)
│   └── grep-searcher v0.1.7 (/home/joshua/src/rust/ripgrep/crates/searcher) (*)
└── log v0.4.11
    ├── globset v0.4.5 (/home/joshua/src/rust/ripgrep/crates/globset)
    │   ├── grep-cli v0.1.5 (/home/joshua/src/rust/ripgrep/crates/cli)
    │   │   └── grep v0.2.7 (/home/joshua/src/rust/ripgrep/crates/grep) (*)
    │   └── ignore v0.4.16 (/home/joshua/src/rust/ripgrep/crates/ignore)
    │       └── ripgrep v12.1.1 (/home/joshua/src/rust/ripgrep)
    ├── grep-cli v0.1.5 (/home/joshua/src/rust/ripgrep/crates/cli) (*)
    ├── grep-regex v0.1.8 (/home/joshua/src/rust/ripgrep/crates/regex)
    │   └── grep v0.2.7 (/home/joshua/src/rust/ripgrep/crates/grep) (*)
    ├── grep-searcher v0.1.7 (/home/joshua/src/rust/ripgrep/crates/searcher) (*)
    ├── ignore v0.4.16 (/home/joshua/src/rust/ripgrep/crates/ignore) (*)
    └── ripgrep v12.1.1 (/home/joshua/src/rust/ripgrep)

cfg-if v1.0.0
└── crossbeam-utils v0.8.0
    └── ignore v0.4.16 (/home/joshua/src/rust/ripgrep/crates/ignore) (*)

@BurntSushi
Copy link
Owner

I'll give it a bit for a new release of log to come out. cc @KodrAus

But having a duplicate dependency on cfg-if is not so bad if necessary. It is very small.

@jyn514
Copy link
Author

jyn514 commented Oct 16, 2020

Let me also work on updating encoding_rs while I'm at it, then.

@jyn514 jyn514 mentioned this pull request Oct 16, 2020
Merged
BurntSushi added a commit that referenced this pull request Nov 2, 2020
@BurntSushi
deps: targeted update of some dependencies
c77a748 
This updates encoding_rs, crossbeam-utils and crossbeam-channel. This
serves two purposes. The encoding_rs update fixes a compilation failure
on the latest nightly. The crossbeam updates are good sense and to
reduce duplicate dependencies such as cfg-if. (Although, we note that
the log crate still pulls in cfg-if 0.1, so ripgrep has a duplicate
dependency there for now. But it's very small.)

Fixes #1721, Closes #1705
@BurntSushi BurntSushi closed this in 3ef63da Nov 2, 2020
@jyn514 jyn514 deleted the crossbeam branch November 2, 2020 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
@jyn514 @BurntSushi