Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e8ef7937dbca
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a35d850f5184
Choose a head ref
  • 9 commits
  • 16 files changed
  • 3 contributors

Commits on Feb 23, 2018

  1. Fix regressions after chr fixes. uptoCommon was changing our single byte 

    encodings because they were shared String buts setEncoding was changing their
encoding.

This seems like a tiny fix but it has a large change in it.  If we setEncoding()
on a shared String it will actually stop sharing the underlying bytelist. In
practice, this could mean some extra bytelist creation behind the scenes.  What
it fixes is n strings sharing the same bytelist suddenly getting a new encoding
because one decided to have force_encoding called on it.

Making that tiny change also forced a couple of other changes because flags
for sharing are fragile due to order dependency when constructing Ruby Strings.

Also tweaked ordering of a conditional which wrankled my delicate sensibilities.
    @enebo
    enebo committed Feb 23, 2018
    Copy the full SHA
    69998e8 View commit details

  2. switch jruby-readline without shaded jline and without jar-dependencies

    @mkristian @enebo
    mkristian authored and enebo committed Feb 23, 2018
    Copy the full SHA
    5c502e3 View commit details

  3. Apply backported RubyGems 2.7.6 patch. 

    See https://bugs.ruby-lang.org/issues/14481
    @headius @enebo
    headius authored and enebo committed Feb 23, 2018
    Copy the full SHA
    4a3214c View commit details

  4. Fixes #5052. String literal difference from MRI. 

    Basic gist of fix is to push '#' onto result buffer if we did not find any
useful characters after the next significant character ('@', '$').  Fixing
this was confusing because we have an ancient outdated pushback(char) method
which actually ignores c (except for eof).
    @enebo
    enebo committed Feb 23, 2018
    Copy the full SHA
    27b8700 View commit details

  5. Added specs for partial string interpolation sequences which are not … 

    …actual

interpolations.  They should just reflect the original string.
    @enebo
    enebo committed Feb 23, 2018
    Copy the full SHA
    ad3ecd3 View commit details

  6. Update for 9.1.16.0 release.

    @enebo
    enebo committed Feb 23, 2018
    Copy the full SHA
    9b68af9 View commit details

  7. Update joni to 2.1.15.

    @enebo
    enebo committed Feb 23, 2018
    Copy the full SHA
    bbb8682 View commit details

  8. Update to next dev version...

    @enebo
    enebo committed Feb 23, 2018
    Copy the full SHA
    2a1d9a5 View commit details

  9. I feel like I am in some git nightmare...Redid the merge I already di… 

    …d to have

another merge undo it...
    @enebo
    enebo committed Feb 23, 2018
    Copy the full SHA
    a35d850 View commit details
Loading