Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

update few deps #99768

Merged
merged 2 commits into from
Jul 30, 2022
Merged

update few deps #99768

merged 2 commits into from
Jul 30, 2022

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Jul 26, 2022

Updates few crates:

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 26, 2022
@joshtriplett
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 27, 2022

📌 Commit 6c0d3c11a05d3235ced47d325c29cfb6be7620ee has been approved by joshtriplett

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 27, 2022
@Mark-Simulacrum
Copy link
Member

@bors rollup=never

@bors
Copy link
Contributor

bors commented Jul 28, 2022

⌛ Testing commit 6c0d3c11a05d3235ced47d325c29cfb6be7620ee with merge 198615c6cf45a2fd1abdf2e1c31c6c3da122f0d1...

@bors
Copy link
Contributor

bors commented Jul 28, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2022
@rust-log-analyzer

This comment has been minimized.

# to view
@klensy
update few deps
43512e6 
openssl-src v111.18.0+1.1.1n -> v111.22.0+1.1.1q
openssl-probe v0.1.2 -> v0.1.5
indoc v1.0.3 -> v1.0.6
bstr v0.2.13 -> v0.2.17
crc32fast v1.2.0 -> v1.3.2
diff v0.1.12 -> v0.1.13
ignore v0.4.17 -> v0.4.18
globset v0.4.5 -> v0.4.9
regex v1.5.5 -> v1.5.6
@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 28, 2022
@Mark-Simulacrum
Copy link
Member

You'll probably need to adjust the src/tools/rustc-workspace-hack/Cargo.toml to enable that feature for memchr across our workspace.

@klensy klensy force-pushed the bump-deps-07-22 branch from 6c0d3c1 to 2787d42 Compare July 28, 2022 14:26
@klensy
Copy link
Contributor Author

klensy commented Jul 28, 2022

Looks like #99771 recently bumped memchr (BurntSushi/memchr@2.4.1...2.5.0) for stdlib too, so maybe that interfere with this PR crates' version/feature set.

@klensy
Copy link
Contributor Author

klensy commented Jul 28, 2022 •
edited
Loading

@rustbot ready

Rebased and updated rustc-workspace-hack/Cargo.toml.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 28, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 29, 2022

📌 Commit 2787d42 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 29, 2022
mqudsi
mqudsi reviewed Jul 29, 2022
View reviewed changes
src/tools/rustc-workspace-hack/Cargo.toml

# looks like the only user of deprecated `use_std` feature is `combine`, so this
# can be removed if/when https://github.com/Marwes/combine/pull/348 be merged and released.
memchr = { version = "2.5", features = ["std", "use_std"] }
# same for regex
Copy link
Contributor

Choose a reason for hiding this comment

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

Nitpick: This comment is now left with an invalid reference! It previously referred to "the previous comment" which spoke about the default features of libz-sys, but you added a comment in between the two and now it looks like "same for regex" means "use_std is deprecated ..."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like it.

Copy link
Member

Choose a reason for hiding this comment

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

So, could someone please file a follow-up PR to fix that comment?

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure. I assigned #100070 to you.

@bors
Copy link
Contributor

bors commented Jul 30, 2022

⌛ Testing commit 2787d42 with merge 760d8a2...

@bors
Copy link
Contributor

bors commented Jul 30, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 760d8a2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 30, 2022
@bors bors merged commit 760d8a2 into rust-lang:master Jul 30, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 30, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (760d8a2): comparison url.

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results
  • Primary benchmarks: 😿 relevant regression found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)		 2.6% 2.6% 1
Regressions 😿
(secondary)		 3.6% 4.2% 4
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) 2.6% 2.6% 1

Cycles

Results
  • Primary benchmarks: mixed results
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions 😿
(primary)		 2.8% 2.8% 1
Regressions 😿
(secondary)		 4.7% 5.6% 5
Improvements 🎉
(primary)		 -6.0% -6.0% 1
Improvements 🎉
(secondary)		 -1.6% -1.6% 1
All 😿🎉 (primary) -1.6% -6.0% 2

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2

  2. number of relevant changes ↩ ↩2

@RalfJung RalfJung mentioned this pull request Aug 2, 2022
Closed
mqudsi added a commit to mqudsi/rust that referenced this pull request Aug 2, 2022
@mqudsi
Clarify Cargo.toml comments
c61603a 
Existing comments were left in an incoherent state after rust-lang#99768.
@mqudsi mqudsi mentioned this pull request Aug 2, 2022
Closed
mqudsi added a commit to mqudsi/rust that referenced this pull request Aug 2, 2022
@mqudsi
Clarify Cargo.toml comments
63e04ee 
Existing comments were left in an incoherent state after rust-lang#99768.
@mqudsi mqudsi mentioned this pull request Aug 2, 2022
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 2, 2022
@matthiaskrgr
Rollup merge of rust-lang#100070 - mqudsi:99768_revisited, r=RalfJung
7a6f461 
Clarify Cargo.toml comments

Existing comments were left in an incoherent state after rust-lang#99768.

r? `@RalfJung`
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@RalfJung RalfJung RalfJung left review comments

@mqudsi mqudsi mqudsi left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.64.0
Development

Successfully merging this pull request may close these issues.
10 participants
@klensy @rust-highfive @joshtriplett @bors @Mark-Simulacrum @rust-log-analyzer @rust-timer @RalfJung @mqudsi @rustbot