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.

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

Fix failing tests #92201

Merged
merged 1 commit into from
Dec 22, 2021
Merged

Fix failing tests #92201

merged 1 commit into from
Dec 22, 2021

Conversation

ChrisDenton
Copy link
Contributor

Fixes tests that have been failing in CI.

I hope it's ok but I've temporarily commented out some of the Windows resolver tests. I actually have a bigger fix for that test code as part of another PR. I could separate it out and patch as necessary but I'd prefer not to rush into that if possible.

r? @Mark-Simulacrum

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 22, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ p=101

@bors
Copy link
Contributor

bors commented Dec 22, 2021

📌 Commit 615604f has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Dec 22, 2021

🌲 The tree is currently closed for pull requests below priority 100. 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 Dec 22, 2021
@bors
Copy link
Contributor

bors commented Dec 22, 2021

⌛ Testing commit 615604f with merge 34926f0...

@bors
Copy link
Contributor

bors commented Dec 22, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 22, 2021
@bors bors merged commit 34926f0 into rust-lang:master Dec 22, 2021
@rustbot rustbot added this to the 1.59.0 milestone Dec 22, 2021
@ChrisDenton ChrisDenton deleted the fix-tests branch December 22, 2021 22:37
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (34926f0): comparison url.

Summary: This benchmark run did not return any relevant changes.

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

@rustbot label: -perf-regression

@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.59.0, 1.58.0 Jan 7, 2022
@Mark-Simulacrum Mark-Simulacrum added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 7, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 8, 2022
…ulacrum

[beta] backports

Backports these PRs:

* Fix HashStable implementation on InferTy rust-lang#91892
* Revert setting a default for the MACOSX_DEPLOYMENT_TARGET env var for linking rust-lang#91870
* Make rustdoc headings black, and markdown blue rust-lang#91534
* Disable LLVM newPM by default rust-lang#91190
* Deduplicate projection sub-obligations rust-lang#90423
*  Sync portable-simd to remove autosplats rust-lang#91484 by dropping portable_simd entirely (keeping the subtree, just from std/core)
*  Quote bat script command line rust-lang#92208
* Fix failing tests rust-lang#92201 (CI fix)

r? `@Mark-Simulacrum`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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
Development

Successfully merging this pull request may close these issues.

None yet

6 participants