From b6ecbc70553239294ad0d5ecd432a73a00efa1b1 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 5 Aug 2014 19:09:08 +0000
Subject: [PATCH] remove path_query

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 4 ++++
 lib/uri/generic.rb | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dddd2528af..e9f0e2ee4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug  6 01:16:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#path_query): remove a private method.
+
 Wed Aug  6 01:15:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/uri/generic.rb (URI::Generic#normalize!): use String#empty?
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index a5ebaa11c3..0169934d04 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -1340,12 +1340,6 @@ module URI
       end
     end
 
-    # returns the assemble String with path and query components
-    def path_query
-      @query ? "#@path?#@query" : @path
-    end
-    private :path_query
-
     #
     # Constructs String from URI
     #