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

compiletest: Rewrite extract_*_version functions #74237

Merged
merged 11 commits into from
Jul 22, 2020
Merged

compiletest: Rewrite extract_*_version functions #74237

merged 11 commits into from
Jul 22, 2020

Conversation

tesuji
Copy link
Contributor

@tesuji tesuji commented Jul 11, 2020 •
edited
Loading

This makes extract_lldb_version has the same version type like
extract_gdb_version.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 11, 2020
@tesuji tesuji force-pushed the compiletest branch 6 times, most recently from a188507 to 3024542 Compare July 12, 2020 15:56
@tesuji
Copy link
Contributor Author

tesuji commented Jul 16, 2020

r? @joshtriplett

@joshtriplett
Copy link
Member

This looks reasonable to me, but I don't think I'm the right reviewer for it. Seems like someone on the compiler team should look at this.

@tesuji
Copy link
Contributor Author

tesuji commented Jul 17, 2020

Thanks Josh! r? @eddyb

@rust-highfive rust-highfive assigned eddyb and unassigned joshtriplett Jul 17, 2020
@eddyb
Copy link
Member

eddyb commented Jul 17, 2020

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

This is technically a breaking change for rustc-dev users. But note that rustc-dev is a nightly component.

How is this a breaking change? Without #73603 we're not shipping compiletest in that component to my knowledge.

@tesuji
Copy link
Contributor Author

tesuji commented Jul 17, 2020 •
edited
Loading

Because compiletest is extracted to a crate, Clippy uses that crate.

@Mark-Simulacrum
Copy link
Member

I still don't see how that's related to rustc-dev; that crate is entirely separate to the in-tree code to my knowledge. It would perhaps want to issue a breaking release (0.6.0) but that seems fine? 0.5.0 of that crate wouldn't break...

@tesuji
Copy link
Contributor Author

tesuji commented Jul 17, 2020

If you tell me there are no breakage, it's fine then. You really know better than me!

Mark-Simulacrum
Mark-Simulacrum reviewed Jul 17, 2020
View reviewed changes
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

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

r=me with nit fixed.

src/tools/compiletest/src/main.rs Outdated Show resolved Hide resolved
@tesuji
Copy link
Contributor Author

tesuji commented Jul 17, 2020 •
edited
Loading

Done. But I'll ping you later when CI is green.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 17, 2020

📌 Commit 47a0f69 has been approved by Mark-Simulacrum

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 17, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Jul 21, 2020

📌 Commit 1314d31 has been approved by Mark-Simulacrum

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 21, 2020
@bors
Copy link
Contributor

bors commented Jul 22, 2020

⌛ Testing commit 1314d31 with merge 4e92f610f5073e680d059c5be4c99b3529f1276b...

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
@Manishearth
Rollup merge of rust-lang#74237 - lzutao:compiletest, r=Mark-Simulacrum
b233720 
compiletest: Rewrite extract_*_version functions

This makes extract_lldb_version has the same version type like
extract_gdb_version.
@Manishearth Manishearth mentioned this pull request Jul 22, 2020
Closed
@Manishearth
Copy link
Member

@bors retry yield

@bors
Copy link
Contributor

bors commented Jul 22, 2020

⌛ Testing commit 1314d31 with merge d4b069030f4c5245849d0e83b3cb695191c525ac...

@bors
Copy link
Contributor

bors commented Jul 22, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 22, 2020
@tesuji
Copy link
Contributor Author

tesuji commented Jul 22, 2020

Network error!

    Updating crates.io index
error: failed to get `cc` as a dependency of package `bootstrap v0.0.0 (D:\a\rust\rust\src\bootstrap)`

Caused by:
  failed to fetch `https://github.com/rust-lang/crates.io-index`

Should close the bors tree I think? cc @pietroalbini

@pietroalbini
Copy link
Member

@bors retry

It should just be spurious.

@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 Jul 22, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
@Manishearth
Rollup merge of rust-lang#74237 - lzutao:compiletest, r=Mark-Simulacrum
7408505 
compiletest: Rewrite extract_*_version functions

This makes extract_lldb_version has the same version type like
extract_gdb_version.
@Manishearth Manishearth mentioned this pull request Jul 22, 2020
Closed
@Manishearth Manishearth mentioned this pull request Jul 22, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2020
@bors
Auto merge of rust-lang#74642 - Manishearth:rollup-148kz52, r=Manishe…
9e92106 
…arth

Rollup of 9 pull requests

Successful merges:

 - rust-lang#73655 (va_args implementation for AAPCS.)
 - rust-lang#73893 (Stabilize control-flow-guard codegen option)
 - rust-lang#74237 (compiletest: Rewrite extract_*_version functions)
 - rust-lang#74454 (small coherence cleanup)
 - rust-lang#74528 (refactor and reword intra-doc link errors)
 - rust-lang#74568 (Apply rust-lang#66379 to `*mut T` `as_ref`)
 - rust-lang#74570 (Use forge links for prioritization procedure)
 - rust-lang#74589 (Update books)
 - rust-lang#74635 (Fix tooltip position if the documentation starts with a code block)

Failed merges:

r? @ghost
@bors bors merged commit 216ed3c into rust-lang:master Jul 22, 2020
@tesuji tesuji deleted the compiletest branch July 22, 2020 18:21
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Awaiting requested review from Mark-Simulacrum

Assignees

@Mark-Simulacrum Mark-Simulacrum

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.47.0
Development

Successfully merging this pull request may close these issues.
10 participants
@tesuji @rust-highfive @joshtriplett @eddyb @Mark-Simulacrum @bors @Manishearth @pietroalbini @cuviper @nikomatsakis