From 9a66f664966e1fe68fa8334413ccaf4858344c1b Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Mon, 27 Feb 2012 18:33:08 +0100
Subject: In feature.pm, inline normalise_hints() into __common(), its only
 caller.

normalise_hints() was added after 5.14.0 was released, so has never been in
a stable release. Hence it's totally safe to kill it.
---
 lib/feature.pm   | 18 +++++++-----------
 regen/feature.pl | 18 +++++++-----------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/lib/feature.pm b/lib/feature.pm
index adaff96263..3f29d781b8 100644
--- a/lib/feature.pm
+++ b/lib/feature.pm
@@ -305,16 +305,6 @@ sub current_bundle {
     return $feature_bundle{$hint_bundles[$bundle_number >> $hint_shift]};
 }
 
-sub normalise_hints {
-    # Delete any keys that may be left over from last time.
-    delete @^H{ values(%feature) };
-    $^H |= $hint_mask;
-    for (@{+shift}) {
-	$^H{$feature{$_}} = 1;
-	$^H |= $hint_uni8bit if $_ eq 'unicode_strings';
-    }
-}
-
 sub import {
     my $class = shift;
 
@@ -342,7 +332,13 @@ sub __common {
     my $import = shift;
     if (my $features = current_bundle) {
 	# Features are enabled implicitly via bundle hints.
-	normalise_hints $features;
+	# Delete any keys that may be left over from last time.
+	delete @^H{ values(%feature) };
+	$^H |= $hint_mask;
+	for (@$features) {
+	    $^H{$feature{$_}} = 1;
+	    $^H |= $hint_uni8bit if $_ eq 'unicode_strings';
+	}
     }
     while (@_) {
         my $name = shift;
diff --git a/regen/feature.pl b/regen/feature.pl
index 79aa471687..7f59847a9d 100755
--- a/regen/feature.pl
+++ b/regen/feature.pl
@@ -589,16 +589,6 @@ sub current_bundle {
     return $feature_bundle{$hint_bundles[$bundle_number >> $hint_shift]};
 }
 
-sub normalise_hints {
-    # Delete any keys that may be left over from last time.
-    delete @^H{ values(%feature) };
-    $^H |= $hint_mask;
-    for (@{+shift}) {
-	$^H{$feature{$_}} = 1;
-	$^H |= $hint_uni8bit if $_ eq 'unicode_strings';
-    }
-}
-
 sub import {
     my $class = shift;
 
@@ -626,7 +616,13 @@ sub __common {
     my $import = shift;
     if (my $features = current_bundle) {
 	# Features are enabled implicitly via bundle hints.
-	normalise_hints $features;
+	# Delete any keys that may be left over from last time.
+	delete @^H{ values(%feature) };
+	$^H |= $hint_mask;
+	for (@$features) {
+	    $^H{$feature{$_}} = 1;
+	    $^H |= $hint_uni8bit if $_ eq 'unicode_strings';
+	}
     }
     while (@_) {
         my $name = shift;
-- 
cgit v1.2.1