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 incremental builds of core by allowing unused attribute. #67884

Merged
merged 1 commit into from
Jan 9, 2020

Conversation

anp
Copy link
Member

@anp anp commented Jan 5, 2020

I think that the same problem as in #65023 was introduced by #67657. This works around the current incrcomp issue with these attributes by allowing it here. This resolves the near-term issue for me, at least.

@rust-highfive
Copy link
Collaborator

r? @shepmaster

(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 Jan 5, 2020
The same problem as in rust-lang#65023 was
introduced by rust-lang#67657. This works
around the current incrcomp issue with these attributes by allowing it
here.
@anp
Copy link
Member Author

anp commented Jan 8, 2020

cc @oli-obk

@oli-obk
Copy link
Contributor

oli-obk commented Jan 8, 2020

I think a single ./x.py clean locally should fix this, too. This is an incremental cache problem that only happens after rebasing without clearing the cache. Rustc tries to reuse a cache that was created by an older rustc.

@anp
Copy link
Member Author

anp commented Jan 8, 2020

Without this patch I have to clean every time I want to run a build. D:

@oli-obk
Copy link
Contributor

oli-obk commented Jan 8, 2020

O_o ok that's not good.

@bors r+

@bors
Copy link
Contributor

bors commented Jan 8, 2020

📌 Commit 3458aba has been approved by oli-obk

@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 Jan 8, 2020
@anp
Copy link
Member Author

anp commented Jan 8, 2020

*when I have local modifications to libcore

Centril added a commit to Centril/rust that referenced this pull request Jan 8, 2020
Fix incremental builds of core by allowing unused attribute.

I *think* that the same problem as in rust-lang#65023 was introduced by rust-lang#67657. This works around the current incrcomp issue with these attributes by allowing it here. This resolves the near-term issue for me, at least.
bors added a commit that referenced this pull request Jan 9, 2020
Rollup of 12 pull requests

Successful merges:

 - #67630 (Treat extern statics just like statics in the "const pointer to static" representation)
 - #67747 (Explain that associated types and consts can't be accessed directly on the trait's path)
 - #67884 (Fix incremental builds of core by allowing unused attribute.)
 - #67966 (Use matches macro in libcore and libstd)
 - #67979 (Move `intravisit` => `rustc_hir` + misc cleanup)
 - #67986 (Display more informative ICE)
 - #67990 (slice patterns: harden match-based borrowck tests)
 - #68005 (Improve E0184 explanation)
 - #68009 (Spell check librustc_error_codes)
 - #68023 (Fix issue #68008)
 - #68024 (Remove `-Z continue-parse-after-error`)
 - #68026 (Small improvements in lexical_region_resolve)

Failed merges:

r? @ghost
@bors bors merged commit 3458aba into rust-lang:master Jan 9, 2020
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