Skip to content

Commit b0eaa9b

Browse files
committed
Whitespace cleanups
1 parent ecf124b commit b0eaa9b

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

src/query.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### Format registry infrastructure
2-
abstract OS
3-
abstract Unix <: OS
2+
abstract OS
3+
abstract Unix <: OS
44
immutable Windows <: OS end
55
immutable OSX <: Unix end
66
immutable Linux <: Unix end
@@ -424,7 +424,7 @@ function iter_eq(A, B)
424424
a=A[i]; b=B[j]
425425
a == b && (i+=1; j+=1; continue)
426426
a == '\r' && (i+=1; continue) # this seems like the shadiest solution to deal with windows \r\n
427-
b == '\r' && (j+=1; continue)
427+
b == '\r' && (j+=1; continue)
428428
return false #now both must be unequal, and no \r windows excemption any more
429429
end
430430
true

test/query.jl

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ try
148148
add_format(format"DOUBLE_1", "test1", ".double")
149149
add_format(format"DOUBLE_2", "test2", ".double")
150150

151-
@fact_throws ErrorException query( "test.double")
152151
fn = string(tempname(), ".double")
153152
open(fn, "w") do file
154153
write(file, "test1")
@@ -209,10 +208,10 @@ try
209208
lenload0 = length(FileIO.sym2loader)
210209
OSKey = @osx ? FileIO.OSX : @windows? FileIO.Windows : @linux ? FileIO.Linux : error("os not supported")
211210
add_format(
212-
format"MultiLib",
211+
format"MultiLib",
213212
UInt8[0x42,0x4d],
214213
".mlb",
215-
[:LoadTest1, FileIO.LOAD, OSKey],
214+
[:LoadTest1, FileIO.LOAD, OSKey],
216215
[:LoadTest2]
217216
)
218217
@fact lensave0 + 1 --> length(FileIO.sym2saver)
@@ -243,25 +242,25 @@ finally
243242
end
244243

245244
file_dir = joinpath(dirname(@__FILE__), "files")
246-
context("STL detection") do
245+
context("STL detection") do
247246
q = query(joinpath(file_dir, "ascii.stl"))
248247
@fact typeof(q) --> File{format"STL_ASCII"}
249248
q = query(joinpath(file_dir, "binary_stl_from_solidworks.STL"))
250249
@fact typeof(q) --> File{format"STL_BINARY"}
251-
open(q) do io
250+
open(q) do io
252251
@fact position(io) --> 0
253252
skipmagic(io)
254253
@fact position(io) --> 0 # no skipping for functions
255254
end
256255
end
257-
context("PLY detection") do
256+
context("PLY detection") do
258257
q = query(joinpath(file_dir, "ascii.ply"))
259258
@fact typeof(q) --> File{format"PLY_ASCII"}
260259
q = query(joinpath(file_dir, "binary.ply"))
261260
@fact typeof(q) --> File{format"PLY_BINARY"}
262261

263262
end
264-
context("Multiple Magic bytes") do
263+
context("Multiple Magic bytes") do
265264
q = query(joinpath(file_dir, "magic1.tiff"))
266265
@fact typeof(q) --> File{format"TIFF"}
267266
q = query(joinpath(file_dir, "magic2.tiff"))
@@ -271,4 +270,4 @@ context("Multiple Magic bytes") do
271270
skipmagic(io)
272271
@fact position(io) --> 4
273272
end
274-
end
273+
end

0 commit comments

Comments
 (0)