improve minor inferrabilities

JuliaLang · Sep 7, 2021 · a72d73d · a72d73d
1 parent d0d895e
commit a72d73d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/base/shell.jl b/base/shell.jl
@@ -88,19 +88,19 @@ function shell_parse(str::AbstractString, interpolate::Bool=true;
                 in_double_quotes = !in_double_quotes
                 i = consume_upto!(arg, s, i, j)
             elseif !in_single_quotes && c == '\\'
-                if !isempty(st) && peek(st)[2] in ('\n', '\r')
+                if !isempty(st) && (peek(st)::Pair{Int,Char})[2] in ('\n', '\r')
                     i = consume_upto!(arg, s, i, j) + 1
-                    if popfirst!(st)[2] == '\r' && peek(st)[2] == '\n'
+                    if popfirst!(st)[2] == '\r' && (peek(st)::Pair{Int,Char})[2] == '\n'
                         i += 1
                         popfirst!(st)
                     end
-                    while !isempty(st) && peek(st)[2] in (' ', '\t')
+                    while !isempty(st) && (peek(st)::Pair{Int,Char})[2] in (' ', '\t')
                         i = nextind(str, i)
                         _ = popfirst!(st)
                     end
                 elseif in_double_quotes
                     isempty(st) && error("unterminated double quote")
-                    k, c′ = peek(st)
+                    k, c′ = peek(st)::Pair{Int,Char}
                     if c′ == '"' || c′ == '$' || c′ == '\\'
                         i = consume_upto!(arg, s, i, j)
                         _ = popfirst!(st)

diff --git a/base/strings/unicode.jl b/base/strings/unicode.jl
@@ -681,7 +681,7 @@ function iterate(g::GraphemeIterator, i_=(Int32(0),firstindex(g.s)))
     y === nothing && return nothing
     c0, k = y
     while k <= ncodeunits(s) # loop until next grapheme is s[i:j]
-        c, ℓ = iterate(s, k)
+        c, ℓ = iterate(s, k)::NTuple{2,Any}
         isgraphemebreak!(state, c0, c) && break
         j = k
         k = ℓ