From 12de0e96fc3f9305e504930cd4e67a41878831db Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Wed, 6 Jan 2021 19:41:19 +0800
Subject: [PATCH] Update actix-http/src/lib.rs

Co-authored-by: Rob Ede <robjtede@icloud.com>
---
 actix-http/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actix-http/src/lib.rs b/actix-http/src/lib.rs
index 7dcb4df4a..0c58df2ed 100644
--- a/actix-http/src/lib.rs
+++ b/actix-http/src/lib.rs
@@ -107,7 +107,7 @@ impl OnConnectData {
 
     // merge self to given request's head extension.
     #[inline]
-    pub(crate) fn merge(&mut self, req: &mut Request) {
+    pub(crate) fn merge_into(&mut self, req: &mut Request) {
         if let Some(ref mut ext) = self.0 {
             req.head.extensions.get_mut().drain_from(ext);
         }