[nomaster] backports 609047ba37 #3551

Merged
merged 1 commit into from Mar 25, 2014

Conversation

Projects
None yet
5 participants
Member

xeno-by commented Feb 18, 2014

xeno-by referenced this pull request in scalamacros/paradise Feb 18, 2014

Closed

Context.typeCheck fails for macro annotations #1

Member

gkossakowski commented Feb 18, 2014

Please link to commit that is in master. The 609047b points at your repo.

Member

xeno-by commented Feb 18, 2014

Hmm, for me the link says https://github.com/scala/scala/commit/609047ba37

Member

gkossakowski commented Feb 18, 2014

Weird. It works now. Sorry for the noise.

Member

gkossakowski commented Feb 18, 2014

When it comes to backport itself I'm not really qualified to asses the risk so I'll leave it to @retronym.

Member

xeno-by commented Feb 18, 2014

Can it still become part of 2.10.4? Would be quite helpful, because it's probably the third or fourth time recently I get a question about this behavior.

Owner

retronym commented Feb 18, 2014

We've already cut RC3, unfortunately. So lets leave this in queue until we conform that we don't need a RC4. (we haven't bothered to branch for 2.10.4 this time)

Member

xeno-by commented Feb 21, 2014

PLS REBUILD ALL

Member

xeno-by commented Feb 21, 2014

Can we merge this now, since RC3 is cut anyway?

Owner

retronym commented Feb 21, 2014

We'll wait until rc3 becomes final.

On Friday, February 21, 2014, Eugene Burmako notifications@github.com
wrote:

Can we merge this now, since RC3 is cut anyway?

Reply to this email directly or view it on GitHubhttps://github.com/scala/scala/pull/3551#issuecomment-35751186
.

adriaanm added the on-hold label Feb 23, 2014

(kitty-note-to-self: ignore 35751149)
🐱 Roger! Rebuilding pr-scala for eef3d20. 🚨

xeno-by added the tested label Mar 10, 2014

Member

xeno-by commented Mar 22, 2014

Ping @retronym

Owner

retronym commented Mar 22, 2014

Can you amend the commit message to be more like a typical got cherry pick -X?

@xeno-by xeno-by [nomaster] typecheck(q"class C") no longer crashes
MemberDefs alone can't be typechecked as is, because namer only names
contents of PackageDefs, Templates and Blocks. And, if not named, a tree
can't be typed.

This commit solves this problem by wrapping typecheckees in a trivial block
and then unwrapping the result when it returns back from the typechecker.

(cherry picked from commit 609047b)
3314d76
Member

xeno-by commented Mar 23, 2014

Here you go.

@xeno-by xeno-by added tested and removed tested labels Mar 23, 2014

Owner

retronym commented Mar 25, 2014

LGTM

@retronym retronym added a commit that referenced this pull request Mar 25, 2014

@retronym retronym Merge pull request #3551 from xeno-by/topic/typecheck-member-def
[nomaster] backports 609047b
2af68ee

@retronym retronym merged commit 2af68ee into scala:2.10.x Mar 25, 2014

1 check passed

default pr-scala Took 52 min.
Details

@retronym retronym added reviewed and removed on-hold labels Mar 25, 2014

xeno-by deleted the xeno-by:topic/typecheck-member-def branch Apr 9, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment