remove EncapsulateC

multiaddr.go

@@ -194,16 +194,6 @@ func (m Multiaddr) Encapsulate(other asMultiaddr) Multiaddr {
 	return Join(m, other)
 }
 
-func (m Multiaddr) EncapsulateC(c *Component) Multiaddr {
-	if c.Empty() {
-		return m
-	}
-	out := make([]Component, 0, len(m)+1)
-	out = append(out, m...)
-	out = append(out, *c)
-	return out
-}
-
 // Decapsulate unwraps Multiaddr up until the given Multiaddr is found.
 func (m Multiaddr) Decapsulate(rightPartsAny asMultiaddr) Multiaddr {
 	if rightPartsAny == nil {

multiaddr_test.go

@@ -1000,7 +1000,7 @@ func TestUseNilComponent(t *testing.T) {
 	_ = foo.String()
 
 	var m Multiaddr = nil
-	m.EncapsulateC(foo)
+	m.Encapsulate(foo)
 }
 
 func TestFilterAddrs(t *testing.T) {

v015-MIGRATION.md

@@ -2,7 +2,7 @@
 
 - There is no `Multiaddr` interface type.
 - Multiaddr is now a concrete type. Not an interface.
-- Empty Multiaddrs/ should be checked with `.Empty()`, not `== nil`. This is similar to how slices should be checked with `len(s) == 0` rather than `s == nil`.
+- Empty Multiaddrs/Component should generally be checked with `.Empty()`, not `== nil`. This is similar to how slices should be checked with `len(s) == 0` rather than `s == nil`.
 - Components do not implement `Multiaddr` as there is no `Multiaddr` to implement.
 - `Multiaddr` can no longer be a key in a Map. If you want unique Multiaddrs, use `Multiaddr.String()` as the key, otherwise you can use the pointer value `*Multiaddr`.
 
@@ -12,4 +12,6 @@
 
 ## Migration tips for v0.15
 
-- If trying to encapsulate a Component to a Multiaddr, use `m.encapsulateC(c)`, instead of the old form of `m.Encapsulate(c)`. `Encapsulate` now only accepts a `Multiaddr`. `EncapsulateC` accepts a `Component`.
+- If your use case supports it, prefer `append` to append a Component to a
+  Multiaddr rather than using `Encapsulate`. It's much faster as it does not do
+  a defensive copy.