Skip to content

Fix strawman compilation v2 #2372

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

Merged
merged 6 commits into from
May 6, 2017

Conversation

odersky
Copy link
Contributor

@odersky odersky commented May 5, 2017

Some more fixes related to making the latest version of the strawman (and some random variations) compile under dotty.

Copy link
Member

@dottybot dottybot left a comment

Choose a reason for hiding this comment

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

Hello, and thank you for opening this PR! 🎉

If you haven't already, please request a review from one of our
collaborators (have no fear, we don't bite)!

All contributors have signed the CLA, thank you! ❤️

Commit Messages

We want to keep history, but for that to actually be useful we have
some rules on how to format our commit messages (relevant xkcd).

Please stick to these guidelines for commit messages:

  1. Separate subject from body with a blank line
  2. When fixing an issue, start your commit message with Fix #<ISSUE-NBR>:
  3. Limit the subject line to 72 characters
  4. Capitalize the subject line
  5. Do not end the subject line with a period
  6. Use the imperative mood in the subject line ("Added" instead of "Add")
  7. Wrap the body at 80 characters
  8. Use the body to explain what and why vs. how

adapted from https://chris.beams.io/posts/git-commit

Have an awesome day! ☀️

odersky added 6 commits May 6, 2017 10:59
It should not happen that we need to turn signed names into strings.
But it did because of the bug that was fixed in the previous commit.
Anyway, toString is the wrong place to get picky about what should
or should not have happened.
This was accidentally left in the code, was intended only for
debugging.
@odersky odersky force-pushed the fix-strawman-compile-2 branch from b927d91 to 1a00fe6 Compare May 6, 2017 09:37
@odersky
Copy link
Contributor Author

odersky commented May 6, 2017

I give up. I tried rebase + git submodule several times. No avail. Why are we doing this?

@odersky
Copy link
Contributor Author

odersky commented May 6, 2017

@nicolasstucki @smarter Can one of you please take over this branch and make it pass the CI? Thanks!

@odersky
Copy link
Contributor Author

odersky commented May 6, 2017

Here's some more info:

/Users/odersky/workspace/dotty> git submodule update --init
fatal: No url found for submodule path 'scala-scala' in .gitmodules
/Users/odersky/workspace/dotty> cat .git
.git/ .gitattributes .gitignore .gitmodules
/Users/odersky/workspace/dotty> cat .gitmodules
[submodule "scala-backend"]
path = scala-backend
url = https://github.com/lampepfl/scala.git
branch = sharing-backend
[submodule "scala2-library"]
path = scala2-library
url = https://github.com/lampepfl/scala.git
branch = dotty-library
[submodule "collection-strawman"]
path = collection-strawman
url = https://github.com/scala/collection-strawman.git
branch = master
/Users/odersky/workspace/dotty>

@smarter
Copy link
Member

smarter commented May 6, 2017

I've removed the scala-scala submodule that was apparently added in this PR.

Copy link
Member

@smarter smarter left a comment

Choose a reason for hiding this comment

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

Otherwise LGTM

chapter: 13
---

# Syntax Summary
Copy link
Member

Choose a reason for hiding this comment

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

This seems to be copy-paste from scalac, and to duplicate the existing syntax.md. Did you intend to add this file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, that was a mistake. I'll remove it.

@smarter
Copy link
Member

smarter commented May 6, 2017

PR is now green :).

@odersky
Copy link
Contributor Author

odersky commented May 6, 2017

Thanks for the fix, @smarter! The spurious scala-scala submodule started showing up in my git status, I believe it was after scala-library was added. I thought I needed to push it like the others. No idea why it showed up suddenly - I did not touch the directory for a while.

@odersky odersky force-pushed the fix-strawman-compile-2 branch from 89946e9 to f47ef9a Compare May 6, 2017 12:14
@smarter
Copy link
Member

smarter commented May 6, 2017

@odersky If you still have a scala-scala directory around, you should remove it, it's been replaced by the scala2-library submodule.

@odersky
Copy link
Contributor Author

odersky commented May 6, 2017

@smarter Good to know!

@odersky odersky merged commit 1ab7641 into scala:master May 6, 2017
@allanrenucci allanrenucci deleted the fix-strawman-compile-2 branch December 14, 2017 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants