Skip to content

Commit 94acda3

Browse files
bors[bot]c42f
bors[bot]
and
c42f
committed
Merge #873
873: Replace trivial uses of rethrow(exc) with rethrow() r=fredrikekre a=c42f In all these cases we're merely rethrowing the existing exception, so it seems simpler and clearer just to use `rethrow()` without arguments. Companion to JuliaLang/julia#29794 Co-authored-by: Chris Foster <[email protected]>
2 parents 5b87bef + f4607fd commit 94acda3

10 files changed

+23
-23
lines changed

‎bin/gitmeta.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function gitmeta(pkgs::Dict{String,Package})
8585
if !updated
8686
try LibGit2.GitObject(repo, git_commit_hash)
8787
catch err
88-
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow(err)
88+
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow()
8989
@info "Updating $pkg from $(p.url)"
9090
LibGit2.fetch(repo, remoteurl=p.url, refspecs=["+refs/*:refs/remotes/cache/*"])
9191
end
@@ -94,7 +94,7 @@ function gitmeta(pkgs::Dict{String,Package})
9494
git_commit = try LibGit2.GitObject(repo, git_commit_hash)
9595
catch err
9696
failed = true
97-
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow(err)
97+
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow()
9898
@error("$pkg: git object $(v.sha1) could not be found")
9999
end
100100
failed && continue

‎src/API.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,22 +122,22 @@ function update_registry(ctx)
122122
try
123123
GitTools.fetch(repo; refspecs=["+refs/heads/$branch:refs/remotes/origin/$branch"])
124124
catch e
125-
e isa PkgError || rethrow(e)
125+
e isa PkgError || rethrow()
126126
push!(errors, (reg, "failed to fetch from repo"))
127127
@goto done
128128
end
129129
ff_succeeded = try
130130
LibGit2.merge!(repo; branch="refs/remotes/origin/$branch", fastforward=true)
131131
catch e
132-
e isa LibGit2.GitError && e.code == LibGit2.Error.ENOTFOUND || rethrow(e)
132+
e isa LibGit2.GitError && e.code == LibGit2.Error.ENOTFOUND || rethrow()
133133
push!(errors, (reg, "branch origin/$branch not found"))
134134
@goto done
135135
end
136136

137137
if !ff_succeeded
138138
try LibGit2.rebase!(repo, "origin/$branch")
139139
catch e
140-
e isa LibGit2.GitError || rethrow(e)
140+
e isa LibGit2.GitError || rethrow()
141141
push!(errors, (reg, "registry failed to rebase on origin/$branch"))
142142
@goto done
143143
end

‎src/Display.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const color_dark = :light_black
2121
function git_file_stream(repo::LibGit2.GitRepo, spec::String; fakeit::Bool=false)::IO
2222
blob = try LibGit2.GitBlob(repo, spec)
2323
catch err
24-
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow(err)
24+
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow()
2525
fakeit && return devnull
2626
end
2727
iob = IOBuffer(LibGit2.content(blob))

‎src/GitTools.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ function clone(url, source_path; header=nothing, kwargs...)
9999
return LibGit2.clone(url, source_path; callbacks=callbacks, kwargs...)
100100
catch err
101101
rm(source_path; force=true, recursive=true)
102-
err isa LibGit2.GitError || rethrow(err)
102+
err isa LibGit2.GitError || rethrow()
103103
if (err.class == LibGit2.Error.Net && err.code == LibGit2.Error.EINVALIDSPEC) ||
104104
(err.class == LibGit2.Error.Repository && err.code == LibGit2.Error.ENOTFOUND)
105105
Pkg.Types.pkgerror("Git repository not found at '$(url)'")
@@ -131,7 +131,7 @@ function fetch(repo::LibGit2.GitRepo, remoteurl=nothing; header=nothing, kwargs.
131131
try
132132
return LibGit2.fetch(repo; remoteurl=remoteurl, callbacks=callbacks, kwargs...)
133133
catch err
134-
err isa LibGit2.GitError || rethrow(err)
134+
err isa LibGit2.GitError || rethrow()
135135
if (err.class == LibGit2.Error.Repository && err.code == LibGit2.Error.ERROR)
136136
Pkg.Types.pkgerror("Git repository not found at '$(remoteurl)'")
137137
else

‎src/GraphType.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,7 @@ function deep_clean!(graph::Graph)
10791079
try
10801080
propagate_constraints!(graph, Set{Int}([p0]), log_events = false)
10811081
catch err
1082-
err isa ResolverError || rethrow(err)
1082+
err isa ResolverError || rethrow()
10831083
gconstr_msk[p0][v0] = false
10841084
end
10851085
pop_snapshot!(graph)

‎src/Operations.jl

+5-5
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ function install_archive(
462462
try
463463
run(cmd, (devnull, devnull, devnull))
464464
catch e
465-
e isa InterruptException && rethrow(e)
465+
e isa InterruptException && rethrow()
466466
url_success = false
467467
end
468468
url_success || continue
@@ -473,7 +473,7 @@ function install_archive(
473473
try
474474
run(cmd, (devnull, devnull, devnull))
475475
catch e
476-
e isa InterruptException && rethrow(e)
476+
e isa InterruptException && rethrow()
477477
@warn "failed to extract archive downloaded from $(archive_url)"
478478
url_success = false
479479
end
@@ -518,7 +518,7 @@ function install_git(
518518
end
519519
break # object was found, we can stop
520520
catch err
521-
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow(err)
521+
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow()
522522
end
523523
GitTools.fetch(repo, url, refspecs=refspecs, credentials=creds)
524524
end
@@ -527,7 +527,7 @@ function install_git(
527527
tree = try
528528
LibGit2.GitObject(repo, git_hash)
529529
catch err
530-
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow(err)
530+
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow()
531531
error("$name: git object $(string(hash)) could not be found")
532532
end
533533
tree isa LibGit2.GitTree ||
@@ -667,7 +667,7 @@ function find_stdlib_deps(ctx::Context, path::String)
667667
endswith(file, ".jl") || continue
668668
filecontent = try read(joinpath(root, file), String)
669669
catch e
670-
e isa SystemError || rethrow(e)
670+
e isa SystemError || rethrow()
671671
""
672672
end
673673
for ((uuid, stdlib), r) in zip(ctx.stdlibs, regexps)

‎src/REPLMode.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ function do_cmd(repl::REPL.AbstractREPL, input::String; do_rethrow=false)
502502
end
503503
catch err
504504
if do_rethrow
505-
rethrow(err)
505+
rethrow()
506506
end
507507
if err isa PkgError || err isa ResolverError
508508
Base.display_error(repl.t.err_stream, ErrorException(sprint(showerror, err)), Ptr{Nothing}[])

‎src/Resolve.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ function sanity_check(graph::Graph, sources::Set{UUID} = Set{UUID}(), verbose::B
122122
try
123123
simplify_graph_soft!(graph, Set{Int}([p0]), log_events = false)
124124
catch err
125-
isa(err, ResolverError) || rethrow(err)
125+
isa(err, ResolverError) || rethrow()
126126
@goto done
127127
end
128128

@@ -220,7 +220,7 @@ function greedysolver(graph::Graph)
220220
try
221221
simplify_graph_soft!(graph, req_inds, log_events = false)
222222
catch err
223-
err isa ResolverError || rethrow(err)
223+
err isa ResolverError || rethrow()
224224
pop_snapshot!(graph)
225225
return (false, Int[])
226226
end

‎src/Types.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ end
476476
function read_manifest(file::String)
477477
try isfile(file) ? open(read_manifest, file) : read_manifest(devnull)
478478
catch err
479-
err isa ErrorException && startswith(err.msg, "ambiguious dependency") || rethrow(err)
479+
err isa ErrorException && startswith(err.msg, "ambiguious dependency") || rethrow()
480480
err.msg *= "In manifest file: $file"
481481
rethrow(err)
482482
end
@@ -755,18 +755,18 @@ function get_object_branch(repo, rev, creds)
755755
gitobject = LibGit2.GitObject(repo, "remotes/cache/heads/" * rev)
756756
isbranch = true
757757
catch err
758-
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow(err)
758+
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow()
759759
end
760760
if gitobject == nothing
761761
try
762762
gitobject = LibGit2.GitObject(repo, rev)
763763
catch err
764-
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow(err)
764+
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow()
765765
GitTools.fetch(repo; refspecs=refspecs, credentials=creds)
766766
try
767767
gitobject = LibGit2.GitObject(repo, rev)
768768
catch err
769-
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow(err)
769+
err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow()
770770
pkgerror("git object $(rev) could not be found")
771771
end
772772
end

‎src/resolve/MaxSum.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ function try_simplify_graph_soft!(graph, sources)
350350
try
351351
simplify_graph_soft!(graph, sources, log_events = false)
352352
catch err
353-
err isa ResolverError || rethrow(err)
353+
err isa ResolverError || rethrow()
354354
return false
355355
end
356356
return true
@@ -373,7 +373,7 @@ function converge!(graph::Graph, msgs::Messages, strace::SolutionTrace, perm::No
373373
try
374374
maxdiff = iterate!(graph, msgs, perm)
375375
catch err
376-
err isa UnsatError || rethrow(err)
376+
err isa UnsatError || rethrow()
377377
if is_best_sofar
378378
p0 = err.p0
379379
s0 = findlast(graph.gconstr[p0])

0 commit comments

Comments
 (0)