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: 50ed7d947b46
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c34b8dbd98c5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 11, 2014

  1. Removed unused RubyEncoding factories.

    @nirvdrum
    nirvdrum committed Dec 11, 2014
    Copy the full SHA
    8bd0df2 View commit details

  2. Removed a bunch of unused, deprecated RubyEncoding methods.

    @nirvdrum
    nirvdrum committed Dec 11, 2014
    Copy the full SHA
    c34b8db View commit details
Showing with 0 additions and 38 deletions.
  1. +0 −38 core/src/main/java/org/jruby/RubyEncoding.java
38 changes: 0 additions & 38 deletions core/src/main/java/org/jruby/RubyEncoding.java
View file
Original file line number Diff line number Diff line change
@@ -119,14 +119,6 @@ public static RubyEncoding newEncoding(Ruby runtime, byte[] name, int p, int end
return new RubyEncoding(runtime, name, p, end, isDummy);
}

public static RubyEncoding newEncoding(Ruby runtime, byte[] name, boolean isDummy) {
return new RubyEncoding(runtime, name, isDummy);
}

public static RubyEncoding newEncoding(Ruby runtime, Encoding encoding) {
return new RubyEncoding(runtime, encoding);
}

public final Encoding getEncoding() {
// TODO: make threadsafe
if (encoding == null) encoding = getRuntime().getEncodingService().loadEncoding(name);
@@ -535,34 +527,4 @@ public static IRubyObject setDefaultInternal(ThreadContext context, IRubyObject
EncodingUtils.rbEncSetDefaultInternal(context, encoding);
return encoding;
}

@Deprecated
public static IRubyObject getDefaultInternal(IRubyObject recv) {
return getDefaultExternal(recv.getRuntime().getCurrentContext(), recv);
}

@Deprecated
public static IRubyObject setDefaultInternal(IRubyObject recv, IRubyObject encoding) {
return setDefaultExternal(recv.getRuntime().getCurrentContext(), recv, encoding);
}

@Deprecated
public static IRubyObject getDefaultExternal(Ruby runtime) {
return runtime.getEncodingService().getDefaultExternal();
}

@Deprecated
public static IRubyObject getDefaultInternal(Ruby runtime) {
return runtime.getEncodingService().getDefaultInternal();
}

@Deprecated
public static IRubyObject convertEncodingToRubyEncoding(Ruby runtime, Encoding defaultEncoding) {
return runtime.getEncodingService().convertEncodingToRubyEncoding(defaultEncoding);
}

@Deprecated
public static Encoding getEncodingFromObject(Ruby runtime, IRubyObject arg) {
return runtime.getEncodingService().getEncodingFromObject(arg);
}
}