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

Commits on Jan 16, 2018

  1. Fix documents 

    `findEncodingNoError` does not raise any error.
    @yui-knk
    yui-knk committed Jan 16, 2018
    Copy the full SHA
    577cc2f View commit details

  2. Merge pull request #4979 from yui-knk/fix_doc 

    Fix documents
    @enebo
    enebo authored Jan 16, 2018
    Copy the full SHA
    baf2bf6 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 core/src/main/java/org/jruby/runtime/encoding/EncodingService.java
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/runtime/encoding/EncodingService.java
View file
Original file line number Diff line number Diff line change
@@ -328,7 +328,7 @@ public Encoding findEncoding(IRubyObject str) {
*
* @param str the object to coerce and use to look up encoding. The coerced String
* must be ASCII-compatible.
* @return the Encoding object found, nil (for internal), or raises ArgumentError
* @return the Encoding object found, nil (for internal)
*/
public Encoding findEncodingNoError(IRubyObject str) {
return findEncodingCommon(str, false);