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 cargo #103558

Merged
merged 1 commit into from
Oct 27, 2022
Merged

Update cargo #103558

merged 1 commit into from
Oct 27, 2022

Conversation

weihanglo
Copy link
Member

5 commits in 071eeaf210708219a5a1b2c4728ca2f97df7f2ae..9210810d1fd7b51ae0439a0a363cc50e36963455 2022-10-22 01:17:55 +0000 to 2022-10-25 22:31:50 +0000

@weihanglo
Update cargo
67c4c1f 
5 commits in 071eeaf210708219a5a1b2c4728ca2f97df7f2ae..9210810d1fd7b51ae0439a0a363cc50e36963455
2022-10-22 01:17:55 +0000 to 2022-10-25 22:31:50 +0000

- Fix 410 gone response handling (rust-lang/cargo#11286)
- Fix inequality in "stale mtime" log messages (rust-lang/cargo#11281)
- doc(cargo-tree): mention it considering feature unification (rust-lang/cargo#11282)
- Improve the error message if `publish` is `false` or empty list (rust-lang/cargo#11280)
- Add test for deleted index entry (rust-lang/cargo#11278)
@rustbot
Copy link
Collaborator

rustbot commented Oct 26, 2022

Some changes occurred in src/tools/cargo

cc @ehuss

@rust-highfive
Copy link
Collaborator

r? @joshtriplett

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

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

rust-lang/cargo#11286 is a fix of unstable feature but doesn't seem to be urgent. I think this PR is rollupable.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 26, 2022

📌 Commit 67c4c1f has been approved by weihanglo

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 Oct 26, 2022
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Oct 26, 2022
@compiler-errors
Rollup merge of rust-lang#103558 - weihanglo:update-cargo, r=weihanglo
29ad394 
Update cargo

5 commits in 071eeaf210708219a5a1b2c4728ca2f97df7f2ae..9210810d1fd7b51ae0439a0a363cc50e36963455 2022-10-22 01:17:55 +0000 to 2022-10-25 22:31:50 +0000

- Fix 410 gone response handling (rust-lang/cargo#11286)
- Fix inequality in "stale mtime" log messages (rust-lang/cargo#11281)
- doc(cargo-tree): mention it considering feature unification (rust-lang/cargo#11282)
- Improve the error message if `publish` is `false` or empty list (rust-lang/cargo#11280)
- Add test for deleted index entry (rust-lang/cargo#11278)
@compiler-errors compiler-errors mentioned this pull request Oct 26, 2022
Closed
@JohnTitor JohnTitor mentioned this pull request Oct 26, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 26, 2022
@bors
Auto merge of rust-lang#103604 - JohnTitor:rollup-q4ns2gh, r=JohnTitor
df57f7b 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#103432 (rustdoc: don't mark Box<T> as Iterator, Read, etc)
 - rust-lang#103526 (More dupe typos again)
 - rust-lang#103537 (rustdoc: combine shared CSS between `.*-line-numbers`)
 - rust-lang#103549 (llvm-16: Don't initialize removed legacy passes)
 - rust-lang#103558 (Update cargo)
 - rust-lang#103567 (ptr::eq: clarify that comparing dyn Trait is fragile)
 - rust-lang#103579 (:arrow_up: rust-analyzer)
 - rust-lang#103580 (Fix typo in docs for `guaranteed_ne`)
 - rust-lang#103596 (thread::set_name: debug-assert that things went well)
 - rust-lang#103598 (rustc_lexer::TokenKind improve docs)

Failed merges:

 - rust-lang#103585 (Migrate source line numbers CSS to CSS variables)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3bfe39e into rust-lang:master Oct 27, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 27, 2022
@weihanglo weihanglo deleted the update-cargo branch October 27, 2022 03:25
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
@bors
Auto merge of rust-lang#103604 - JohnTitor:rollup-q4ns2gh, r=JohnTitor
1e0b113 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#103432 (rustdoc: don't mark Box<T> as Iterator, Read, etc)
 - rust-lang#103526 (More dupe typos again)
 - rust-lang#103537 (rustdoc: combine shared CSS between `.*-line-numbers`)
 - rust-lang#103549 (llvm-16: Don't initialize removed legacy passes)
 - rust-lang#103558 (Update cargo)
 - rust-lang#103567 (ptr::eq: clarify that comparing dyn Trait is fragile)
 - rust-lang#103579 (:arrow_up: rust-analyzer)
 - rust-lang#103580 (Fix typo in docs for `guaranteed_ne`)
 - rust-lang#103596 (thread::set_name: debug-assert that things went well)
 - rust-lang#103598 (rustc_lexer::TokenKind improve docs)

Failed merges:

 - rust-lang#103585 (Migrate source line numbers CSS to CSS variables)

r? `@ghost`
`@rustbot` modify labels: rollup
pietroalbini added a commit to ferrocene/sphinx-shared-resources that referenced this pull request Mar 22, 2023
@bors-ferrocene @Veykril
@pietroalbini @DropDemBits @bors
Merge #600
3f42cd2 
600: Pull changes from upstream `master` r=kirtchev-adacore a=pietroalbini

* rust-lang/rust#103605
* rust-lang/rust#103604
  * rust-lang/rust#103598
  * rust-lang/rust#103596
  * rust-lang/rust#103580
  * rust-lang/rust#103579
  * rust-lang/rust#103567
  * rust-lang/rust#103558
  * rust-lang/rust#103549
  * rust-lang/rust#103537
  * rust-lang/rust#103526
  * rust-lang/rust#103432
* rust-lang/rust#103571
* rust-lang/rust#103492
* rust-lang/rust#103572
  * rust-lang/rust#103554
  * rust-lang/rust#103546
  * rust-lang/rust#103543
  * rust-lang/rust#103428
  * rust-lang/rust#102706
  * rust-lang/rust#95710
* rust-lang/rust#103284
* rust-lang/rust#103562
  * rust-lang/rust#103542
  * rust-lang/rust#103536
  * rust-lang/rust#103533
  * rust-lang/rust#103520
  * rust-lang/rust#103444
  * rust-lang/rust#103430
  * rust-lang/rust#103416
  * rust-lang/rust#103287
  * rust-lang/rust#103209
  * rust-lang/rust#102951
* rust-lang/rust#103279
* rust-lang/rust#103158



Co-authored-by: Lukas Wirth <[email protected]>
Co-authored-by: Pietro Albini <[email protected]>
Co-authored-by: DropDemBits <[email protected]>
Co-authored-by: bors <[email protected]>
Co-authored-by: Pietro Albini <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@joshtriplett joshtriplett

Labels
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.66.0
Development

Successfully merging this pull request may close these issues.
5 participants
@weihanglo @rustbot @rust-highfive @bors @joshtriplett