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

WIP: 2.2 compat #3518

Merged
merged 93 commits into from Jan 4, 2016
Merged

WIP: 2.2 compat #3518

merged 93 commits into from Jan 4, 2016

Conversation

tak1n
Copy link
Member

@tak1n tak1n commented Oct 15, 2015

Just opening this PR to let it run through travis.
Our 2.2 branch is not recognized.

ruipserra and others added 30 commits July 24, 2015 22:18
In Ruby 2.2+, we have #receiver, so it makes sense to use consistent names
here and and get rid of #self and #self= in favor of #receiver and #receiver=
These were lost by accident while resolving merge conflicts between the master
branch and the 2.2 branch.
kachick and others added 27 commits July 24, 2015 22:22
This commit fixes a build error due to a signature mismatch of the Time::at
method and the way it was being used in Stat::stat_birthtime.
The implementation relies on Module#direct_superclass to run through the
whole ancestry chain as #superclass would not include the modules.

The method is about 2 times slower than the MRI implementation though.
Benchmark: http://git.io/vmhpf.
Interesting enough MRI still lets you define methods on these objects
even when they're frozen. For example, this works just fine:

    def nil.foo
    end

    nil.foo
* master:
  Fixes to assist building Rubinius under Alpine Linux (with musl).
  Changed "of the issue" to "if the issue"
  Contributing notes on version managers/releases
  Expand $PID in Metrics filename.
  Clean up log output of serial_debug/ic_debug
  Specify `superclass` in respect to `prepend`
  Fix correction to documentation for OnStack class.
  Fixed typ in the OnStack class
  Log class names for invalid ivars_ references
  Add a C-API "rb_hash_clear"
  Fix Range#bsearch for matching end value in find-minimum mode
  Fix String#split with 0 limit. Fixes #3474
  Add a String#split spec with 0 limit
Convert a fd to -(fd + 1) if its a Fixnum seems wrong.
Negative fds's are mostly invalid.
* 2.2:
  allow nil,true,false to be modified when frozen
Check for st_atim, st_mtim, st_ctim, etc. in struct stat (sys/stat.h)
chuckremes added a commit that referenced this pull request Jan 4, 2016
@chuckremes chuckremes merged commit d8e5c64 into master Jan 4, 2016
@yorickpeterse yorickpeterse deleted the 2.2 branch January 4, 2016 16:32
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.

None yet

10 participants