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

Modify test to make rustc PR mergeable #7883

Merged
merged 1 commit into from
Feb 12, 2020
Merged

Conversation

estebank
Copy link
Contributor

Modify a test to be less succeptible to failure for wording changes.

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 12, 2020
@@ -64,7 +64,7 @@ fn check_fail() {

foo.cargo("check")
.with_status(101)
.with_stderr_contains("[..]this function takes 0 parameters but 1 parameter was supplied")
.with_stderr_contains("[..]this function takes 0")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
.with_stderr_contains("[..]this function takes 0")
.with_stderr_contains("[..]this function takes 0[..]")

It has to match an entire line.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Modify a test to be less succeptible to failure for wording changes.
@ehuss
Copy link
Contributor

ehuss commented Feb 12, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 12, 2020

📌 Commit e0787ec has been approved by ehuss

@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 Feb 12, 2020
@bors
Copy link
Collaborator

bors commented Feb 12, 2020

⌛ Testing commit e0787ec with merge a491aa7...

bors added a commit that referenced this pull request Feb 12, 2020
Modify test to make `rustc` PR mergeable

Modify a test to be less succeptible to failure for wording changes.
@bors
Copy link
Collaborator

bors commented Feb 12, 2020

☀️ Test successful - checks-azure
Approved by: ehuss
Pushing a491aa7 to master...

@bors bors merged commit e0787ec into rust-lang:master Feb 12, 2020
bors added a commit to rust-lang/rust that referenced this pull request Feb 19, 2020
Update cargo

9 commits in 3c53211c3d7fee4f430f170115af5baad17a3da9..e02974078a692d7484f510eaec0e88d1b6cc0203
2020-02-07 15:35:03 +0000 to 2020-02-18 15:24:43 +0000
- Set an environment variable for tests to find executables. (rust-lang/cargo#7697)
- Rework internal errors. (rust-lang/cargo#7896)
- Improvements to StringList config handling. (rust-lang/cargo#7891)
- Add new/old rustflags to fingerprint log. (rust-lang/cargo#7890)
- Fix inaccurate doc comment on `env_args`. (rust-lang/cargo#7889)
- Add some extra fingerprint debug information. (rust-lang/cargo#7888)
- Link the licenses into crates/cargo-platform (rust-lang/cargo#7886)
- Modify test to make `rustc` PR mergeable (rust-lang/cargo#7883)
- Keep environment variables in a BTreeMap to preserve sort order (rust-lang/cargo#7877)
ehuss pushed a commit to ehuss/cargo that referenced this pull request Mar 16, 2020
Modify test to make `rustc` PR mergeable

Modify a test to be less succeptible to failure for wording changes.
bors added a commit that referenced this pull request Mar 17, 2020
Bump stable version to 0.43.1

There was a hiccup where 0.43.0 was published to crates.io missing a change (#7848), see #7994 for details. It is not super critical, but in rare cases the bug can cause cargo used as a library to hang.  I think bumping the version and re-publishing is relatively low-effort and low-risk.

This also includes backports to appease CI: #7883 #7906 #7955.
@ehuss ehuss added this to the 1.43.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants