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(test): Add back in newlines to diffs #12753

Merged
merged 1 commit into from
Sep 30, 2023
Merged

fix(test): Add back in newlines to diffs #12753

merged 1 commit into from
Sep 30, 2023

Conversation

epage
Copy link
Contributor

@epage epage commented Sep 30, 2023

Errors like this aren't too helpful

error: stderr did not match:
1   1     error: failed to parse manifest at `[..]`2   2     3   3     Caused by:4   4       TOML parse error at line 3, column 275   5         |6   6       3 |                 version = 17
  7         |                           ^8        -  invalid type: integer `1`, expected SemVer version    8    +  invalid type: integer `1`, expected a string or workspace

This was broken in #12751

Errors like this aren't too helpful
```
error: stderr did not match:
1   1     error: failed to parse manifest at `[..]`2   2     3   3     Caused by:4   4       TOML parse error at line 3, column 275   5         |6   6       3 |                 version = 17
  7         |                           ^8        -  invalid type: integer `1`, expected SemVer version    8    +  invalid type: integer `1`, expected a string or workspace
```

This was broken in rust-lang#12581
@rustbot
Copy link
Collaborator

rustbot commented Sep 30, 2023

r? @weihanglo

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-testing-cargo-itself Area: cargo's tests S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 30, 2023
@weihanglo
Copy link
Member

weihanglo commented Sep 30, 2023

I completely don't know why #12581 caused this but the fix makes sense.

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 30, 2023

📌 Commit 37c6f3d 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 Sep 30, 2023
@bors
Copy link
Collaborator

bors commented Sep 30, 2023

⌛ Testing commit 37c6f3d with merge 288f424...

@epage
Copy link
Contributor Author

epage commented Sep 30, 2023

Somehow my copy buffer didn't update: #12751

@bors
Copy link
Collaborator

bors commented Sep 30, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 288f424 to master...

@bors bors merged commit 288f424 into rust-lang:master Sep 30, 2023
20 checks passed
@epage epage deleted the error branch October 1, 2023 00:20
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 4, 2023
Update cargo

9 commits in 59596f0f31a94fde48b5aa7e945cd0b7ceca9620..794d0a82547f3081044c0aca7b6083733ce51344
2023-09-29 19:29:17 +0000 to 2023-10-03 23:19:33 +0000
- Prep for automating MSRV management (rust-lang/cargo#12767)
- chore(deps): update rust crate itertools to 0.11.0 (rust-lang/cargo#12759)
- fix bug: corruption when cargo killed while writing (rust-lang/cargo#12744)
- Disable custom_target::custom_bin_target on windows-gnu (rust-lang/cargo#12763)
- chore(deps): update compatible (rust-lang/cargo#12757)
- Add more missing `strip` info to docs. (rust-lang/cargo#12754)
- chore(deps): update actions/checkout action to v4 (rust-lang/cargo#12762)
- chore(deps): update rust crate cargo_metadata to 0.18.0 (rust-lang/cargo#12758)
- fix(test): Add back in newlines to diffs (rust-lang/cargo#12753)

r? ghost
@ehuss ehuss added this to the 1.75.0 milestone Oct 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testing-cargo-itself Area: cargo's tests 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

5 participants