Consolidate IOContext calls, add parens in a range

antoine-levitt · Jul 1, 2017 · 8db51e6 · 8db51e6
1 parent c2bcd15
commit 8db51e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/base/sparse/sparsematrix.jl b/base/sparse/sparsematrix.jl
@@ -175,7 +175,7 @@ function Base.show(io::IOContext, S::SparseMatrixCSC)
  print(io, "\n \u22ee")
  # find the column to start printing in for the last print_count elements
  nextcol = searchsortedfirst(S.colptr, nnz(S) - print_count + 1)
- for r = nnz(S) - print_count + 1 : S.colptr[nextcol] - 1
+ for r = (nnz(S) - print_count + 1) : (S.colptr[nextcol] - 1)
  print(io, "\n", _format_line(r, nextcol - 1))
  end
  # print all of the remaining columns

diff --git a/test/sparse/sparse.jl b/test/sparse/sparse.jl
@@ -1773,14 +1773,14 @@ end
  show(io, MIME"text/plain"(), spzeros(Float32, Int64, 2, 2))
  @test String(take!(io)) == "2×2 SparseMatrixCSC{Float32,Int64} with 0 stored entries"
 
- ioc = IOContext(IOContext(io, :displaysize => (5, 80)), :limit => true)
+ ioc = IOContext(io, displaysize = (5, 80), limit = true)
  show(ioc, MIME"text/plain"(), sparse(Int64[1], Int64[1], [1.0]))
  @test String(take!(io)) == "1×1 SparseMatrixCSC{Float64,Int64} with 1 stored entry:\n [1, 1] = 1.0"
  show(ioc, MIME"text/plain"(), sparse(Int64[1, 1], Int64[1, 2], [1.0, 2.0]))
  @test String(take!(io)) == "1×2 SparseMatrixCSC{Float64,Int64} with 2 stored entries:\n ⋮"
 
  # even number of rows
- ioc = IOContext(IOContext(io, :displaysize => (8, 80)), :limit => true)
+ ioc = IOContext(io, displaysize = (8, 80), limit = true)
  show(ioc, MIME"text/plain"(), sparse(Int64[1,2,3,4], Int64[1,1,2,2], [1.0,2.0,3.0,4.0]))
  @test String(take!(io)) == string("4×2 SparseMatrixCSC{Float64,Int64} with 4 stored entries:\n [1, 1]",
  " = 1.0\n [2, 1] = 2.0\n [3, 2] = 3.0\n [4, 2] = 4.0")
@@ -1794,7 +1794,7 @@ end
  " = 1.0\n ⋮\n [5, 3] = 1.0")
 
  # odd number of rows
- ioc = IOContext(IOContext(io, :displaysize => (9, 80)), :limit => true)
+ ioc = IOContext(io, displaysize = (9, 80), limit = true)
  show(ioc, MIME"text/plain"(), sparse(Int64[1,2,3,4,5], Int64[1,1,2,2,3], [1.0,2.0,3.0,4.0,5.0]))
  @test String(take!(io)) == string("5×3 SparseMatrixCSC{Float64,Int64} with 5 stored entries:\n [1, 1]",
  " = 1.0\n [2, 1] = 2.0\n [3, 2] = 3.0\n [4, 2] = 4.0\n [5, 3] = 5.0")
@@ -1807,7 +1807,7 @@ end
  @test String(take!(io)) == string("6×3 SparseMatrixCSC{Float64,$Int} with 18 stored entries:\n [1, 1]",
  " = 1.0\n [2, 1] = 1.0\n ⋮\n [5, 3] = 1.0\n [6, 3] = 1.0")
 
- ioc = IOContext(io, :displaysize => (9, 80))
+ ioc = IOContext(io, displaysize = (9, 80))
  show(ioc, MIME"text/plain"(), sparse(Int64[1,2,3,4,5,6], Int64[1,1,2,2,3,3], [1.0,2.0,3.0,4.0,5.0,6.0]))
  @test String(take!(io)) == string("6×3 SparseMatrixCSC{Float64,Int64} with 6 stored entries:\n [1, 1] = 1.0\n",
  " [2, 1] = 2.0\n [3, 2] = 3.0\n [4, 2] = 4.0\n [5, 3] = 5.0\n [6, 3] = 6.0")