Skip to content

[nightly] Fix CVE-2022-46176 #106687

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

Merged
merged 3 commits into from
Jan 11, 2023
Merged

Conversation

pietroalbini
Copy link
Member

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Jan 10, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jan 10, 2023

Some changes occurred in src/tools/cargo

cc @ehuss

@pietroalbini
Copy link
Member Author

@bors r+ p=750

@bors
Copy link
Collaborator

bors commented Jan 10, 2023

📌 Commit e491b08 has been approved by pietroalbini

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Jan 10, 2023

🌲 The tree is currently closed for pull requests below priority 50. This pull request will be tested once the tree is reopened.

@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 Jan 10, 2023
@bors
Copy link
Collaborator

bors commented Jan 10, 2023

⌛ Testing commit e491b08 with merge ae66549d8e0e37722f3873d49b3b6b57096a780f...

@pietroalbini
Copy link
Member Author

@bors retry yield to stable

@bors
Copy link
Collaborator

bors commented Jan 10, 2023

⌛ Testing commit e491b08 with merge 8c1bea7ab55a593d6f5f2406a8bdcb38c32ba85f...

@pietroalbini
Copy link
Member Author

@bors retry yield to stable

@bors
Copy link
Collaborator

bors commented Jan 10, 2023

⌛ Testing commit e491b08 with merge bf7ea0d...

@bors
Copy link
Collaborator

bors commented Jan 11, 2023

☀️ Test successful - checks-actions
Approved by: pietroalbini
Pushing bf7ea0d to master...

1 similar comment
@bors
Copy link
Collaborator

bors commented Jan 11, 2023

☀️ Test successful - checks-actions
Approved by: pietroalbini
Pushing bf7ea0d to master...

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels Jan 11, 2023
@bors bors merged commit bf7ea0d into rust-lang:master Jan 11, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 11, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (bf7ea0d): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.6% [0.6%, 0.6%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.5% [-0.5%, -0.5%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.1% [0.8%, 1.4%] 4
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.1% [0.8%, 1.4%] 4

Cycles

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

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@pietroalbini pietroalbini deleted the pa-cve-nightly branch January 11, 2023 08:28
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants