mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/drb/acl.rb: Removed meaningless #to_s methods in interpolation.
[Feature #10174][ruby-core:64584] * lib/erb.rb: ditto. * lib/observer.rb: ditto. * lib/rake/invocation_chain.rb: ditto. * lib/rubygems/command_manager.rb: ditto. * lib/rubygems/config_file.rb: ditto. * lib/uri/common.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3e8515bf36
commit
e47fec1f86
8 changed files with 18 additions and 7 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
||||||
|
Wed Aug 27 21:19:40 2014 gogo tanaka <mail@tanakakazuki.com>
|
||||||
|
|
||||||
|
* lib/drb/acl.rb: Removed meaningless #to_s methods in interpolation.
|
||||||
|
[Feature #10174][ruby-core:64584]
|
||||||
|
* lib/erb.rb: ditto.
|
||||||
|
* lib/observer.rb: ditto.
|
||||||
|
* lib/rake/invocation_chain.rb: ditto.
|
||||||
|
* lib/rubygems/command_manager.rb: ditto.
|
||||||
|
* lib/rubygems/config_file.rb: ditto.
|
||||||
|
* lib/uri/common.rb: ditto.
|
||||||
|
|
||||||
Wed Aug 27 21:08:20 2014 gogo tanaka <mail@tanakakazuki.com>
|
Wed Aug 27 21:08:20 2014 gogo tanaka <mail@tanakakazuki.com>
|
||||||
|
|
||||||
* lib/drb/drb.rb: use attr_reader instead of Module#attr.
|
* lib/drb/drb.rb: use attr_reader instead of Module#attr.
|
||||||
|
|
|
@ -223,7 +223,7 @@ class ACL
|
||||||
when 'deny'
|
when 'deny'
|
||||||
@deny.add(domain)
|
@deny.add(domain)
|
||||||
else
|
else
|
||||||
raise "Invalid ACL entry #{list.to_s}"
|
raise "Invalid ACL entry #{list}"
|
||||||
end
|
end
|
||||||
i += 2
|
i += 2
|
||||||
end
|
end
|
||||||
|
|
|
@ -548,7 +548,7 @@ class ERB
|
||||||
def initialize(compiler, enc=nil)
|
def initialize(compiler, enc=nil)
|
||||||
@compiler = compiler
|
@compiler = compiler
|
||||||
@line = []
|
@line = []
|
||||||
@script = enc ? "#coding:#{enc.to_s}\n" : ""
|
@script = enc ? "#coding:#{enc}\n" : ""
|
||||||
@compiler.pre_cmd.each do |x|
|
@compiler.pre_cmd.each do |x|
|
||||||
push(x)
|
push(x)
|
||||||
end
|
end
|
||||||
|
|
|
@ -127,7 +127,7 @@ module Observable
|
||||||
def add_observer(observer, func=:update)
|
def add_observer(observer, func=:update)
|
||||||
@observer_peers = {} unless defined? @observer_peers
|
@observer_peers = {} unless defined? @observer_peers
|
||||||
unless observer.respond_to? func
|
unless observer.respond_to? func
|
||||||
raise NoMethodError, "observer does not respond to `#{func.to_s}'"
|
raise NoMethodError, "observer does not respond to `#{func}'"
|
||||||
end
|
end
|
||||||
@observer_peers[observer] = func
|
@observer_peers[observer] = func
|
||||||
end
|
end
|
||||||
|
|
|
@ -31,7 +31,7 @@ module Rake
|
||||||
private
|
private
|
||||||
|
|
||||||
def prefix
|
def prefix
|
||||||
"#{tail.to_s} => "
|
"#{tail} => "
|
||||||
end
|
end
|
||||||
|
|
||||||
# Null object for an empty chain.
|
# Null object for an empty chain.
|
||||||
|
|
|
@ -136,7 +136,7 @@ class Gem::CommandManager
|
||||||
def run(args, build_args=nil)
|
def run(args, build_args=nil)
|
||||||
process_args(args, build_args)
|
process_args(args, build_args)
|
||||||
rescue StandardError, Timeout::Error => ex
|
rescue StandardError, Timeout::Error => ex
|
||||||
alert_error "While executing gem ... (#{ex.class})\n #{ex.to_s}"
|
alert_error "While executing gem ... (#{ex.class})\n #{ex}"
|
||||||
ui.backtrace ex
|
ui.backtrace ex
|
||||||
|
|
||||||
terminate_interaction(1)
|
terminate_interaction(1)
|
||||||
|
|
|
@ -337,7 +337,7 @@ if you believe they were disclosed to a third party.
|
||||||
end
|
end
|
||||||
return content
|
return content
|
||||||
rescue *YAMLErrors => e
|
rescue *YAMLErrors => e
|
||||||
warn "Failed to load #{filename}, #{e.to_s}"
|
warn "Failed to load #{filename}, #{e}"
|
||||||
rescue Errno::EACCES
|
rescue Errno::EACCES
|
||||||
warn "Failed to load #{filename} due to permissions problem."
|
warn "Failed to load #{filename} due to permissions problem."
|
||||||
end
|
end
|
||||||
|
|
|
@ -51,7 +51,7 @@ module URI
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
raise ArgumentError,
|
raise ArgumentError,
|
||||||
"expected Array of or Hash of components of #{klass.to_s} (#{klass.component[1..-1].join(', ')})"
|
"expected Array of or Hash of components of #{klass} (#{klass.component[1..-1].join(', ')})"
|
||||||
end
|
end
|
||||||
tmp[:scheme] = klass.to_s.sub(/\A.*::/, '').downcase
|
tmp[:scheme] = klass.to_s.sub(/\A.*::/, '').downcase
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue