diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/matrix.rb | 3 | ||||
| -rw-r--r-- | lib/mkmf.rb | 10 | ||||
| -rw-r--r-- | lib/net/http/generic_request.rb | 4 | ||||
| -rw-r--r-- | lib/rss/rss.rb | 8 |
4 files changed, 11 insertions, 14 deletions
diff --git a/lib/matrix.rb b/lib/matrix.rb index 00fa762da6..f4e3b316f6 100644 --- a/lib/matrix.rb +++ b/lib/matrix.rb @@ -1404,8 +1404,7 @@ class Matrix begin ret = obj.__send__(meth) rescue Exception => e - raise TypeError, "Coercion error: #{obj.inspect}.#{meth} => #{cls} failed:\n" \ - "(#{e.message})" + raise TypeError, "Coercion error: #{obj.inspect}.#{meth} => #{cls} failed:\n(#{e.message})" end raise TypeError, "Coercion error: obj.#{meth} did NOT return a #{cls} (was #{ret.class})" unless ret.kind_of? cls ret diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 0996392300..ec110fd6f6 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1026,7 +1026,7 @@ SRC # def have_framework(fw, &b) checking_for fw do - src = cpp_include("#{fw}/#{fw}.h") << "\n" "int main(void){return 0;}" + src = cpp_include("#{fw}/#{fw}.h") << "\n#{''}int main(void){return 0;}" opt = " -framework #{fw}" if try_link(src, "-ObjC#{opt}", &b) $defs.push(format("-DHAVE_FRAMEWORK_%s", fw.tr_cpp)) @@ -1761,7 +1761,7 @@ arch_hdrdir = #{$arch_hdrdir.quote} VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} } if $extmk - mk << "RUBYLIB =\n""RUBYOPT = -\n" + mk << "RUBYLIB =\n#{''}RUBYOPT = -\n" end prefix = mkintpath(CONFIG["prefix"]) if destdir = prefix[$dest_prefix_pattern, 1] @@ -2376,7 +2376,7 @@ MESSAGE EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip} - hdr = ['#include "ruby.h"' "\n"] + hdr = ["#include \"ruby.h\"\n"] config_string('COMMON_MACROS') do |s| Shellwords.shellwords(s).each do |w| w, v = w.split(/=/, 2) @@ -2396,13 +2396,13 @@ MESSAGE COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<' COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<' TRY_LINK = config_string('TRY_LINK') || - "$(CC) #{OUTFLAG}conftest#{$EXEEXT} $(INCFLAGS) $(CPPFLAGS) " \ + "$(CC) #{OUTFLAG}conftest#{$EXEEXT} $(INCFLAGS) $(CPPFLAGS) " << "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)" LINK_SO = config_string('LINK_SO') || if CONFIG["DLEXT"] == $OBJEXT "ld $(DLDFLAGS) -r -o $@ $(OBJS)\n" else - "$(LDSHARED) #{OUTFLAG}$@ $(OBJS) " \ + "$(LDSHARED) #{OUTFLAG}$@ $(OBJS) " << "$(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)" end LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L%s' diff --git a/lib/net/http/generic_request.rb b/lib/net/http/generic_request.rb index bcf87d35be..f10ddebfaa 100644 --- a/lib/net/http/generic_request.rb +++ b/lib/net/http/generic_request.rb @@ -186,9 +186,7 @@ class Net::HTTPGenericRequest if filename filename = quote_string(filename, charset) type = h[:content_type] || 'application/octet-stream' - buf << "Content-Disposition: form-data; " \ - "name=\"#{key}\"; filename=\"#{filename}\"\r\n" \ - "Content-Type: #{type}\r\n\r\n" + buf << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{filename}\"\r\nContent-Type: #{type}\r\n\r\n" if !out.respond_to?(:write) || !value.respond_to?(:read) # if +out+ is not an IO or +value+ is not an IO buf << (value.respond_to?(:read) ? value.read : value) diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb index 3d90d54912..e1b37e6a39 100644 --- a/lib/rss/rss.rb +++ b/lib/rss/rss.rb @@ -591,10 +591,10 @@ EOC def #{accessor_name}=(*args) receiver = self.class.name - warn("Warning:\#{caller.first.sub(/:in `.*'\z/, '')}: " \ - "Don't use `\#{receiver}\##{accessor_name} = XXX'/" \ - "`\#{receiver}\#set_#{accessor_name}(XXX)'. " \ - "Those APIs are not sense of Ruby. " \ + warn("Warning:\#{caller.first.sub(/:in `.*'\z/, '')}: " << + "Don't use `\#{receiver}\##{accessor_name} = XXX'/" << + "`\#{receiver}\#set_#{accessor_name}(XXX)'. " << + "Those APIs are not sense of Ruby. " << "Use `\#{receiver}\##{plural_name} << XXX' instead of them.") if args.size == 1 @#{accessor_name}.push(args[0]) |