[前][次][番号順一覧][スレッド一覧]

ruby-changes:53332

From: kazu <ko1@a...>
Date: Mon, 5 Nov 2018 16:01:54 +0900 (JST)
Subject: [ruby-changes:53332] kazu:r65548 (trunk): Fix up r65505 [ci skip]

kazu	2018-11-05 16:01:49 +0900 (Mon, 05 Nov 2018)

  New Revision: 65548

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65548

  Log:
    Fix up r65505 [ci skip]

  Modified files:
    trunk/lib/drb/gw.rb
    trunk/lib/net/https.rb
    trunk/lib/rss/maker/0.9.rb
    trunk/lib/rss/maker/1.0.rb
    trunk/lib/rss/maker/2.0.rb
    trunk/lib/rss/maker/content.rb
    trunk/lib/rss/maker/dublincore.rb
    trunk/lib/rss/maker/image.rb
    trunk/lib/rss/maker/itunes.rb
    trunk/lib/rss/maker/slash.rb
    trunk/lib/rss/maker/syndication.rb
    trunk/lib/rss/maker/taxonomy.rb
    trunk/lib/rss/maker/trackback.rb
    trunk/lib/rss/maker.rb
Index: lib/rss/maker/1.0.rb
===================================================================
--- lib/rss/maker/1.0.rb	(revision 65547)
+++ lib/rss/maker/1.0.rb	(revision 65548)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/rss/maker/1.0.rb#L1
 # frozen_string_literal: false
-require "rss/1.0"
+require_relative "../1.0"
 
 require_relative "base"
 
Index: lib/rss/maker/taxonomy.rb
===================================================================
--- lib/rss/maker/taxonomy.rb	(revision 65547)
+++ lib/rss/maker/taxonomy.rb	(revision 65548)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rss/maker/taxonomy.rb#L1
 # frozen_string_literal: false
 require_relative '../taxonomy'
-require 'rss/maker/1.0'
+require_relative '1.0'
 require_relative 'dublincore'
 
 module RSS
Index: lib/rss/maker/2.0.rb
===================================================================
--- lib/rss/maker/2.0.rb	(revision 65547)
+++ lib/rss/maker/2.0.rb	(revision 65548)
@@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/rss/maker/2.0.rb#L1
 # frozen_string_literal: false
-require "rss/2.0"
+require_relative "../2.0"
 
-require "rss/maker/0.9"
+require_relative "0.9"
 
 module RSS
   module Maker
Index: lib/rss/maker/image.rb
===================================================================
--- lib/rss/maker/image.rb	(revision 65547)
+++ lib/rss/maker/image.rb	(revision 65548)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rss/maker/image.rb#L1
 # frozen_string_literal: false
 require_relative '../image'
-require 'rss/maker/1.0'
+require_relative '1.0'
 require_relative 'dublincore'
 
 module RSS
Index: lib/rss/maker/syndication.rb
===================================================================
--- lib/rss/maker/syndication.rb	(revision 65547)
+++ lib/rss/maker/syndication.rb	(revision 65548)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rss/maker/syndication.rb#L1
 # frozen_string_literal: false
 require_relative '../syndication'
-require 'rss/maker/1.0'
+require_relative '1.0'
 
 module RSS
   module Maker
Index: lib/rss/maker/trackback.rb
===================================================================
--- lib/rss/maker/trackback.rb	(revision 65547)
+++ lib/rss/maker/trackback.rb	(revision 65548)
@@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/rss/maker/trackback.rb#L1
 # frozen_string_literal: false
 require_relative '../trackback'
-require 'rss/maker/1.0'
-require 'rss/maker/2.0'
+require_relative '1.0'
+require_relative '2.0'
 
 module RSS
   module Maker
Index: lib/rss/maker/0.9.rb
===================================================================
--- lib/rss/maker/0.9.rb	(revision 65547)
+++ lib/rss/maker/0.9.rb	(revision 65548)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/rss/maker/0.9.rb#L1
 # frozen_string_literal: false
-require "rss/0.9"
+require_relative "../0.9"
 
 require_relative "base"
 
Index: lib/rss/maker/dublincore.rb
===================================================================
--- lib/rss/maker/dublincore.rb	(revision 65547)
+++ lib/rss/maker/dublincore.rb	(revision 65548)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rss/maker/dublincore.rb#L1
 # frozen_string_literal: false
 require_relative '../dublincore'
-require 'rss/maker/1.0'
+require_relative '1.0'
 
 module RSS
   module Maker
Index: lib/rss/maker/itunes.rb
===================================================================
--- lib/rss/maker/itunes.rb	(revision 65547)
+++ lib/rss/maker/itunes.rb	(revision 65548)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rss/maker/itunes.rb#L1
 # frozen_string_literal: false
 require_relative '../itunes'
-require 'rss/maker/2.0'
+require_relative '2.0'
 
 module RSS
   module Maker
Index: lib/rss/maker/content.rb
===================================================================
--- lib/rss/maker/content.rb	(revision 65547)
+++ lib/rss/maker/content.rb	(revision 65548)
@@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/rss/maker/content.rb#L1
 # frozen_string_literal: false
 require_relative '../content'
-require 'rss/maker/1.0'
-require 'rss/maker/2.0'
+require_relative '1.0'
+require_relative '2.0'
 
 module RSS
   module Maker
Index: lib/rss/maker/slash.rb
===================================================================
--- lib/rss/maker/slash.rb	(revision 65547)
+++ lib/rss/maker/slash.rb	(revision 65548)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rss/maker/slash.rb#L1
 # frozen_string_literal: false
 require_relative '../slash'
-require 'rss/maker/1.0'
+require_relative '1.0'
 
 module RSS
   module Maker
Index: lib/rss/maker.rb
===================================================================
--- lib/rss/maker.rb	(revision 65547)
+++ lib/rss/maker.rb	(revision 65548)
@@ -65,8 +65,8 @@ module RSS https://github.com/ruby/ruby/blob/trunk/lib/rss/maker.rb#L65
   end
 end
 
-require "rss/maker/1.0"
-require "rss/maker/2.0"
+require_relative "maker/1.0"
+require_relative "maker/2.0"
 require_relative "maker/feed"
 require_relative "maker/entry"
 require_relative "maker/content"
Index: lib/net/https.rb
===================================================================
--- lib/net/https.rb	(revision 65547)
+++ lib/net/https.rb	(revision 65548)
@@ -4,7 +4,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/net/https.rb#L4
 = net/https -- SSL/TLS enhancement for Net::HTTP.
 
   This file has been merged with net/http.  There is no longer any need to
-  require_relative 'https' to use HTTPS.
+  require 'net/https' to use HTTPS.
 
   See Net::HTTP for details on how to make HTTPS connections.
 
Index: lib/drb/gw.rb
===================================================================
--- lib/drb/gw.rb	(revision 65547)
+++ lib/drb/gw.rb	(revision 65548)
@@ -109,7 +109,7 @@ s2.thread.join https://github.com/ruby/ruby/blob/trunk/lib/drb/gw.rb#L109
 =begin
 # foo.rb
 
-require_relative 'drb'
+require 'drb/drb'
 
 class Foo
   include DRbUndumped
@@ -127,7 +127,7 @@ end https://github.com/ruby/ruby/blob/trunk/lib/drb/gw.rb#L127
 
 =begin
 # gw_a.rb
-require_relative 'unix'
+require 'drb/unix'
 require 'foo'
 
 obj = Foo.new('a')
@@ -141,7 +141,7 @@ DRb.thread.join https://github.com/ruby/ruby/blob/trunk/lib/drb/gw.rb#L141
 
 =begin
 # gw_c.rb
-require_relative 'unix'
+require 'drb/unix'
 require 'foo'
 
 foo = Foo.new('c', nil)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]