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

Use pathdiff crate #74464

Merged
merged 3 commits into from
Jul 18, 2020
Merged

Use pathdiff crate #74464

merged 3 commits into from
Jul 18, 2020

Conversation

FedericoPonzi
Copy link
Contributor

I wanted to tackle a simple issue, and stumbled upon #67108: this pr removes the function which was exported to the external crate as required in the todo/issue.
I've tested it with:

./x.py build --stage 1 --keep-stage 1 src/librustc_codegen_ssa 

And it looks like it's compiling

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (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 Jul 17, 2020
@Mark-Simulacrum
Copy link
Member

I'm going to r? @Manishearth as it's their crate -- I guess I'm not opposed but feels a little bit odd in some sense :)

Maybe this should be an unstable API on Paths? Based on the comment here it sounds like at some point itwas...

@Manishearth
Copy link
Member

@bors r+

Yeah, it was at some point, and I made an external crate by copying out rustc's code to get access to it again.

@bors
Copy link
Contributor

bors commented Jul 17, 2020

📌 Commit 4b6a027 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Jul 17, 2020

🌲 The tree is currently closed for pull requests below priority 5, 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 Jul 17, 2020
@FedericoPonzi
Copy link
Contributor Author

According to CI's logs:

Dependencies not explicitly permitted:
* pathdiff 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)

Unfortunatey I wasn't aware of this step. How can I request permissions for it?

@Manishearth
Copy link
Member

@bors r-

Oh yeah there's src/tools/tidy/src/deps.rs

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 17, 2020
@FedericoPonzi
Copy link
Contributor Author

I've added the "pathdiff" package there, thanks!

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 17, 2020

📌 Commit 5702ce8 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Jul 17, 2020

🌲 The tree is currently closed for pull requests below priority 5, 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 17, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 18, 2020
…r=Manishearth

Fix for rust-lang#67108

I wanted to tackle a simple issue, and stumbled upon rust-lang#67108: this pr removes the function which was exported to the external crate as required in the todo/issue.
I've tested it with:
```
./x.py build --stage 1 --keep-stage 1 src/librustc_codegen_ssa
```
And it looks like it's compiling
@Manishearth Manishearth changed the title Fix for #67108 Use pathdiff crate Jul 18, 2020
@Manishearth
Copy link
Member

For future reference, make sure to run ./x.py fmt and ./x.py tidy. I've fixed up the issues in the rollup so you're fine for now.

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 18, 2020
…r=Manishearth

Use pathdiff crate

I wanted to tackle a simple issue, and stumbled upon rust-lang#67108: this pr removes the function which was exported to the external crate as required in the todo/issue.
I've tested it with:
```
./x.py build --stage 1 --keep-stage 1 src/librustc_codegen_ssa
```
And it looks like it's compiling
@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 18, 2020

📌 Commit c41db4c has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Jul 18, 2020

🌲 The tree is currently closed for pull requests below priority 5, this pull request will be tested once the tree is reopened

@FedericoPonzi
Copy link
Contributor Author

Will do, sorry about that and thanks for giving this PR a more meaningful name!

For future reference, make sure to run ./x.py fmt and ./x.py tidy. I've fixed up the issues in the rollup so you're fine for now.

Will do, sorry about that and thanks for giving this issue a more meaningful name

@eddyb
Copy link
Member

eddyb commented Jul 18, 2020

I've tested it with:

./x.py build --stage 1 --keep-stage 1 src/librustc_codegen_ssa

For the record, if you just want to make sure it compiles, ./x.py check src/librustc_codegen_ssa (maybe even without the path, I don't know if it makes much of a difference), should be much faster.

But you can also replace --stage 1 --keep-stage 1 with --stage 0, I am not aware of any benefits to building the compiler at stage 1 by using --keep-stage, only pain and suffering additional complexity.

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 18, 2020
…arth

Rollup of 11 pull requests

Successful merges:

 - rust-lang#72414 ( Add lazy initialization primitives to std)
 - rust-lang#74069 (Compare tagged/niche-filling layout and pick the best one)
 - rust-lang#74418 (ci: Set `shell: bash` as a default, remove duplicates)
 - rust-lang#74441 (bootstrap.py: patch RPATH on NixOS to handle the new zlib dependency.)
 - rust-lang#74444 (Add regression test for rust-lang#69414)
 - rust-lang#74448 (improper_ctypes_definitions: allow `Box`)
 - rust-lang#74449 (Test codegen of compare_exchange operations)
 - rust-lang#74450 (Fix `Safety` docs for `from_raw_parts_mut`)
 - rust-lang#74453 (Use intra-doc links in `str` and `BTreeSet`)
 - rust-lang#74457 (rustbuild: drop tool::should_install)
 - rust-lang#74464 (Use pathdiff crate)

Failed merges:

r? @ghost
@bors bors merged commit cae9c50 into rust-lang:master Jul 18, 2020
@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
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.

7 participants