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 some issues with attributes on unnamed fields #66669

Merged
merged 2 commits into from
Nov 25, 2019

Conversation

petrochenkov
Copy link
Contributor

Fixes #66487
Fixes #66555

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@bors
Copy link
Contributor

bors commented Nov 24, 2019

☔ The latest upstream changes (presumably #66680) made this pull request unmergeable. Please resolve the merge conflicts.

@petrochenkov
Copy link
Contributor Author

r? @matthewjasper

@matthewjasper
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Nov 24, 2019

📌 Commit f1359c6 has been approved by matthewjasper

@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 Nov 24, 2019
@bors
Copy link
Contributor

bors commented Nov 25, 2019

⌛ Testing commit f1359c6 with merge e35f2ada430b6f0fd928529cd0ece66d18588a56...

@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-11-25T01:14:03.8286760Z do so (now or later) by using -b with the checkout command again. Example:
2019-11-25T01:14:03.8286879Z 
2019-11-25T01:14:03.8287168Z   git checkout -b <new-branch-name>
2019-11-25T01:14:03.8287239Z 
2019-11-25T01:14:03.8287916Z HEAD is now at e35f2ada4 Auto merge of #66669 - petrochenkov:tup2attr, r=matthewjasper
2019-11-25T01:14:03.8663701Z ##[section]Starting: Decide whether to run this job
2019-11-25T01:14:03.8784626Z ==============================================================================
2019-11-25T01:14:03.8784779Z Task         : Bash
2019-11-25T01:14:03.8784920Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-11-25T01:14:05.1286271Z BUILD_SOURCEBRANCHNAME=auto
2019-11-25T01:14:05.1286471Z BUILD_SOURCESDIRECTORY=D:\a\2\s
2019-11-25T01:14:05.1286685Z BUILD_SOURCEVERSION=e35f2ada430b6f0fd928529cd0ece66d18588a56
2019-11-25T01:14:05.1286895Z BUILD_SOURCEVERSIONAUTHOR=bors
2019-11-25T01:14:05.1287126Z BUILD_SOURCEVERSIONMESSAGE=Auto merge of #66669 - petrochenkov:tup2attr, r=matthewjasper
2019-11-25T01:14:05.1287625Z CI_JOB_NAME=dist-i686-msvc
2019-11-25T01:14:05.1287814Z COBERTURA_HOME=C:\cobertura-2.1.1
2019-11-25T01:14:05.1288022Z COMMONPROGRAMFILES=C:\Program Files\Common Files
2019-11-25T01:14:05.1288251Z COMMON_TESTRESULTSDIRECTORY=D:\a\2\TestResults
---
2019-11-25T01:18:56.2129239Z 
2019-11-25T01:18:56.2129672Z Total Download Size:    168.30 MiB
2019-11-25T01:18:56.2129935Z Total Installed Size:  1048.57 MiB
2019-11-25T01:18:56.2130206Z 
2019-11-25T01:18:56.2130488Z :: Proceed with installation? [Y/n] error: Partition / too full: 48241 blocks needed, 40153 blocks free
2019-11-25T01:18:56.2130643Z error: failed to commit transaction (not enough free disk space)
2019-11-25T01:18:56.2642209Z Errors occurred, no packages were upgraded.
2019-11-25T01:18:56.2667103Z 
2019-11-25T01:18:56.2667103Z 
2019-11-25T01:18:56.2783365Z ##[error]Bash exited with code '1'.
2019-11-25T01:18:56.2919688Z ##[section]Starting: Checkout
2019-11-25T01:18:56.3017431Z ==============================================================================
2019-11-25T01:18:56.3017572Z Task         : Get sources
2019-11-25T01:18:56.3017690Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Nov 25, 2019

💔 Test failed - checks-azure

@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 Nov 25, 2019
@dtolnay
Copy link
Member

dtolnay commented Nov 25, 2019

@bors retry

@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 Nov 25, 2019
@bors
Copy link
Contributor

bors commented Nov 25, 2019

⌛ Testing commit f1359c6 with merge 4eee955...

bors added a commit that referenced this pull request Nov 25, 2019
Fix some issues with attributes on unnamed fields

Fixes #66487
Fixes #66555
@bors
Copy link
Contributor

bors commented Nov 25, 2019

☀️ Test successful - checks-azure
Approved by: matthewjasper
Pushing 4eee955 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 25, 2019
@bors bors merged commit f1359c6 into rust-lang:master Nov 25, 2019
@tmandry tmandry added beta-nominated Nominated for backporting to the compiler in the beta channel. I-nominated stable-nominated Nominated for backporting to the compiler in the stable channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 26, 2019
@tmandry
Copy link
Member

tmandry commented Nov 26, 2019

Er, well, I nominated for beta and stable backports since #66555 is marked as a stable-to-stable regression. But now I can't reproduce on either beta or stable, so un-nominating.

(Leaving I-nominated so someone can follow up.)

@tmandry tmandry removed beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Nov 26, 2019
@tmandry
Copy link
Member

tmandry commented Nov 26, 2019

Actually, I can reproduce on stable and beta with the testcase in #66555 (comment). I was using a testcase I built myself using serde attributes (which showed up in the Fuchsia tree).

Re-nominating; sorry for the noise :)

@tmandry tmandry added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Nov 26, 2019
@pnkfelix pnkfelix added beta-accepted Accepted for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Dec 7, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Dec 9, 2019
resolve: Resolve visibilities on fields with non-builtin attributes

Follow-up to rust-lang#66669.

The first commit is primary (and also a backport candidate), the other ones are further cleanups.
In this case it's not strictly necessary to avoid reporting errors during speculative resolution because 1) all visibilities are resolved non-speculatively sooner or later and 2) error reporting infrastructure merges identical errors with identical spans anyway.

Fixes rust-lang#67006
r? @matthewjasper
@Mark-Simulacrum Mark-Simulacrum removed beta-nominated Nominated for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Dec 14, 2019
bors added a commit that referenced this pull request Dec 14, 2019
[beta] Beta backports

Backporting the following pull requests:

 * resolve: Always resolve visibilities on impl items #67236
 * resolve: Resolve visibilities on fields with non-builtin attributes #67106
 * E0023: handle expected != tuple pattern type #67044
 * Fix `unused_parens` triggers on macro by example code #66983
 * Fix some issues with attributes on unnamed fields #66669
 * Ensure that we get a hard error on generic ZST constants if their bodies #67134 (via #67297)

Some of these conflicted on merge, I resolved where possible, sometimes by cherry-picking a commit or two more from the relevant PRs. Since those changes are necessary though for backport to proceed (otherwise not even std/core compile), seems fine -- they're fairly minor cleanups anyway.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
9 participants