Skip to content
This repository has been archived by the owner. It is now read-only.

Patch to fix #4477. #8

Closed
wants to merge 2 commits into from
Closed

Patch to fix #4477. #8

wants to merge 2 commits into from

Conversation

@soc
Copy link
Member

@soc soc commented Apr 14, 2011

Added field "since" to annotation class deprecated and added the manually verified version to the 318 occurences of @deprecated in src/library. Fixes #4477.

@soc
Copy link
Member Author

@soc soc commented Apr 14, 2011

Hi retronym!

"2.9.0" would be better here.

OK, I wasn't sure how the versioning would look like in the future. I'll fix that.

Default arguments rather than multiple constructors.

I will fix that. Is the default of null ok, or should I use ""?

The way the version is provided as a String is not consistent with scala.annotation.migration. I actually like this way better, it's less type safe but shows all three components of the version number and reads better.

That was my concern, too. In that case I thought that the accuracy might be more important here, because it will mainly be used by documentation. Otherwise I would have to add something like majorVersion: Int, minorVersion: Int, patchVersion: Int, buildVersion: String ... any ideas?

@soc soc closed this Apr 14, 2011
@retronym
Copy link
Member

@retronym retronym commented Apr 14, 2011

I think you'd need some input from @extempore regarding those questions.

@retronym
Copy link
Member

@retronym retronym commented Apr 14, 2011

BTW, the pull request process is easier if you work on a topic branch. You can then commit additional changes to the topic branch, and see them on the same pull request.

It also makes it easier for you to work on multiple changes.

@soc
Copy link
Member Author

@soc soc commented Apr 16, 2011

@retronym: How would I do that with git? A simple git branch?

@retronym
Copy link
Member

@retronym retronym commented Apr 16, 2011

Fork and Clone

Fork the scala/scala to soc/scala
$ git clone git@github.com:soc/scala.git

Setup your remotes

$ git remote add scala-github git://github.com/scala/scala.git
$ git remote add soc-github git@github.com:soc/scala.git

Time passes

Sync with scala/scala

$ git checkout master
$ git pull scala-github master

Make a Topic Branch

$ git checkout master
$ git checkout -b ticket/1234   # make a local branch, based on master
$ git push soc-github ticket/1234   # push your branch to your github account
$ git branch --set-upstream ticket/1234 soc-github/ticket/1234  # configure your local branch to track the remote
$ vim
$ git commit -m "fixed stuff"
$ git push soc-github ticket/1234  # or just git push, if the tracking branch is correctly configured

Sync Topic Branch with Upstream Changes

$ git checkout master
$ git pull scala-github master
$ git push soc-github master
$ git checkout ticket/1234
$ git merge master
@soc
Copy link
Member Author

@soc soc commented Apr 16, 2011

Thanks! I guess I just bookmark your response :-)

pedrofurla pushed a commit to pedrofurla/scala that referenced this pull request Apr 23, 2011
…ection

so those hypothetical people who use non-sun jvms won't be thrown off kilter.
You can give it a file argument or a class name, including classes you just
defined in the repl, and it will clean up the repl mangling on the way out.

  scala> class Bippy { def hackenkraks(x: Float, y: Double) = 5 }
  defined class Bippy

  scala> :javap Bippy
  Compiled from "<console>"
  public class Bippy extends java.lang.Object implements scala.ScalaObject
  [...]
  public int hackenkraks(float, double);
    Signature: (FD)I
    Code:
     Stack=1, Locals=4, Args_size=3
     0:	iconst_5
     1:	ireturn

  scala> :javap scala.collection.Map
  public interface scala.collection.Map extends scala.collection.Iterable,scala.collection.MapLike,scala.ScalaObject
  [...]
  const scala#7 = Asciz	ScalaSig;
  const scala#8 = Asciz	<A:Ljava/lang/Object;B:Ljava/lang/Object;>Ljava/lang/Object;Lscala/collection/Iterable<Lscala/Tuple2<TA;TB;>;>;Lscala/collection/MapLike<TA;TB;Lscala/collection/Map<TA;TB;>;>;Lscala/ScalaObject;;
  const scala#9 = Asciz	Lscala/reflect/ScalaSignature;;
  const scala#10 = Asciz	bytes;
  const scala#11 = Asciz	[line elided for control chars: possibly a scala signature]

  scala> :javap java.util.Enumeration
  Compiled from "Enumeration.java"
  public interface java.util.Enumeration
  [...]

  scala> :javap /scala/trunk/build/quick/classes/compiler/scala/tools/util/Javap.class
  Compiled from "Javap.scala"
  public class scala.tools.util.Javap extends java.lang.Object implements scala.ScalaObject
  [...]

No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@24167 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants