Remove unused code: AbstractContainer (#2662)

Author: DanielDoehring

src/auxiliary/containers.jl

@@ -149,34 +149,6 @@ function invalidate!(c::AbstractContainer, id::Int)
     return invalidate!(c, id, id)
 end
 
-# Swap two elements in a container while preserving element connectivity.
-function swap!(c::AbstractContainer, a::Int, b::Int)
-    @assert 1<=a<=length(c) "a out of range"
-    @assert 1<=b<=length(c) "b out of range"
-
-    # Return if swap would be a no-op
-    if a == b
-        return c
-    end
-
-    # Move a to dummy location
-    raw_copy!(c, a, c.dummy)
-    move_connectivity!(c, a, c.dummy)
-
-    # Move b to a
-    raw_copy!(c, b, a)
-    move_connectivity!(c, b, a)
-
-    # Move from dummy location to b
-    raw_copy!(c, c.dummy, b)
-    move_connectivity!(c, c.dummy, b)
-
-    # Invalidate dummy to be sure
-    invalidate!(c, c.dummy)
-
-    return c
-end
-
 # Insert blank elements in container, shifting the following elements back.
 #
 # After a call to insert!, the range `position:position + count - 1` will be available for use.
@@ -209,25 +181,6 @@ function insert!(c::AbstractContainer, position::Int, count::Int)
     return c
 end
 
-# Erase elements from container, deleting their connectivity and then invalidating their data.
-# TODO: Shall we extend Base.deleteat! or Base.delete! ?
-function erase!(c::AbstractContainer, first::Int, last::Int)
-    @assert 1<=first<=length(c) "First cell out of range"
-    @assert 1<=last<=length(c) "Last cell out of range"
-
-    # Return if eraseure would be a no-op
-    if last < first
-        return c
-    end
-
-    # Delete connectivity and invalidate cells
-    delete_connectivity!(c, first, last)
-    invalidate!(c, first, last)
-
-    return c
-end
-erase!(c::AbstractContainer, id::Int) = erase!(c, id, id)
-
 # Remove cells and shift existing cells forward to close the gap
 function remove_shift!(c::AbstractContainer, first::Int, last::Int)
     @assert 1<=first<=length(c) "First cell out of range"
@@ -257,44 +210,6 @@ function remove_shift!(c::AbstractContainer, first::Int, last::Int)
 end
 remove_shift!(c::AbstractContainer, id::Int) = remove_shift!(c, id, id)
 
-# Remove cells and fill gap with cells from the end of the container (to reduce copy operations)
-function remove_fill!(c::AbstractContainer, first::Int, last::Int)
-    @assert 1<=first<=length(c) "First cell out of range"
-    @assert 1<=last<=length(c) "Last cell out of range"
-
-    # Return if removal would be a no-op
-    if last < first
-        return c
-    end
-
-    # Delete connectivity of cells to be removed and then invalidate them
-    delete_connectivity!(c, first, last)
-    invalidate!(c, first, last)
-
-    # Copy cells from end (unless last is already the last cell)
-    count = last - first + 1
-    if last < length(c)
-        move!(c, max(length(c) - count + 1, last + 1), length(c), first)
-    end
-
-    # Reduce length
-    c.length -= count
-
-    return c
-end
-
-# Reset container to zero-length and with a new capacity
-function reset!(c::AbstractContainer, capacity::Int)
-    @assert capacity >= 0
-
-    c.capacity = capacity
-    c.length = 0
-    c.dummy = capacity + 1
-    reset_data_structures!(c)
-
-    return c
-end
-
 # Invalidate all elements and set length to zero.
 function clear!(c::AbstractContainer)
     invalidate!(c)

test/test_unit.jl

@@ -392,22 +392,6 @@ end
         @test Trixi.move!(c, 1, 2) == MyContainer([0, 1, 3])
     end
 
-    @testset "swap!" begin
-        c = MyContainer([1, 2])
-        @test Trixi.swap!(c, 1, 1) == MyContainer([1, 2]) # no-op
-
-        c = MyContainer([1, 2])
-        @test Trixi.swap!(c, 1, 2) == MyContainer([2, 1])
-    end
-
-    @testset "erase!" begin
-        c = MyContainer([1, 2])
-        @test Trixi.erase!(c, 2, 1) == MyContainer([1, 2]) # no-op
-
-        c = MyContainer([1, 2])
-        @test Trixi.erase!(c, 1) == MyContainer([0, 2])
-    end
-
     @testset "remove_shift!" begin
         c = MyContainer([1, 2, 3, 4])
         @test Trixi.remove_shift!(c, 2, 1) == MyContainer([1, 2, 3, 4]) # no-op
@@ -418,19 +402,6 @@ end
         c = MyContainer([1, 2, 3, 4])
         @test Trixi.remove_shift!(c, 2) == MyContainer([1, 3, 4], 4)
     end
-
-    @testset "remove_fill!" begin
-        c = MyContainer([1, 2, 3, 4])
-        @test Trixi.remove_fill!(c, 2, 1) == MyContainer([1, 2, 3, 4]) # no-op
-
-        c = MyContainer([1, 2, 3, 4])
-        @test Trixi.remove_fill!(c, 2, 2) == MyContainer([1, 4, 3], 4)
-    end
-
-    @testset "reset!" begin
-        c = MyContainer([1, 2, 3])
-        @test Trixi.reset!(c, 2) == MyContainer(Int[], 2)
-    end
 end
 
 @timed_testset "example elixirs" begin