Skip to content

Commit f79b469

Browse files
authored
Merge branch 'master' into nl/case
2 parents d146e23 + f354532 commit f79b469

File tree

26 files changed

+422
-334
lines changed

26 files changed

+422
-334
lines changed

NEWS.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,7 +1383,9 @@ Command-line option changes
13831383
[#25725]: https://github.com/JuliaLang/julia/issues/25725
13841384
[#25745]: https://github.com/JuliaLang/julia/issues/25745
13851385
[#25763]: https://github.com/JuliaLang/julia/issues/25763
1386+
[#25786]: https://github.com/JuliaLang/julia/issues/25786
13861387
[#25812]: https://github.com/JuliaLang/julia/issues/25812
1388+
[#25815]: https://github.com/JuliaLang/julia/issues/25815
13871389
[#25830]: https://github.com/JuliaLang/julia/issues/25830
13881390
[#25845]: https://github.com/JuliaLang/julia/issues/25845
13891391
[#25854]: https://github.com/JuliaLang/julia/issues/25854
@@ -1400,4 +1402,10 @@ Command-line option changes
14001402
[#26071]: https://github.com/JuliaLang/julia/issues/26071
14011403
[#26080]: https://github.com/JuliaLang/julia/issues/26080
14021404
[#26149]: https://github.com/JuliaLang/julia/issues/26149
1405+
[#26154]: https://github.com/JuliaLang/julia/issues/26154
1406+
[#26156]: https://github.com/JuliaLang/julia/issues/26156
1407+
[#26161]: https://github.com/JuliaLang/julia/issues/26161
1408+
[#26262]: https://github.com/JuliaLang/julia/issues/26262
1409+
[#26284]: https://github.com/JuliaLang/julia/issues/26284
1410+
[#26286]: https://github.com/JuliaLang/julia/issues/26286
14031411
[#26442]: https://github.com/JuliaLang/julia/issues/26442

base/array.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ copyto!(dest::Array{T}, src::Array{T}) where {T} = copyto!(dest, 1, src, 1, leng
217217
# N.B: The generic definition in multidimensional.jl covers, this, this is just here
218218
# for bootstrapping purposes.
219219
function fill!(dest::Array{T}, x) where T
220+
@_noinline_meta
220221
xT = convert(T, x)
221222
for i in 1:length(dest)
222223
@inbounds dest[i] = xT
@@ -318,6 +319,7 @@ function fill!(a::Union{Array{UInt8}, Array{Int8}}, x::Integer)
318319
end
319320

320321
function fill!(a::Array{T}, x) where T<:Union{Integer,AbstractFloat}
322+
@_noinline_meta
321323
xT = convert(T, x)
322324
for i in eachindex(a)
323325
@inbounds a[i] = xT

base/char.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ representable in a given `AbstractChar` type.
2020
Internally, an `AbstractChar` type may use a variety of encodings. Conversion
2121
via `codepoint(char)` will not reveal this encoding because it always returns the
2222
Unicode value of the character. `print(io, c)` of any `c::AbstractChar`
23-
produces an encoding determined by `io` (UTF-8 for all built-in [`IO`](@ref)
23+
produces an encoding determined by `io` (UTF-8 for all built-in `IO`
2424
types), via conversion to `Char` if necessary.
2525
2626
`write(io, c)`, in contrast, may emit an encoding depending on

base/docs/basedocs.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ julia> i = 1
416416
417417
julia> while i < 5
418418
println(i)
419-
i += 1
419+
global i += 1
420420
end
421421
1
422422
2

base/io.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ buffer_writes(x::IO, bufsize=SZ_UNBUFFERED_IO) = x
3333
"""
3434
isopen(object) -> Bool
3535
36-
Determine whether an object - such as a stream, timer, or [`mmap`](@ref Mmap.mmap)
36+
Determine whether an object - such as a stream or timer
3737
-- is not yet closed. Once an object is closed, it will never produce a new event.
3838
However, since a closed stream may still have data to read in its buffer,
3939
use [`eof`](@ref) to check for the ability to read data.

base/strings/search.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ Find the first occurrence of `pattern` in `string`. Equivalent to
9191
9292
# Examples
9393
```jldoctest
94-
julia> findfirst("z", "Hello to the world")
95-
0:-1
94+
julia> findfirst("z", "Hello to the world") # returns nothing, but not printed in the REPL
9695
9796
julia> findfirst("Julia", "JuliaLang")
9897
1:5

doc/make.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ for stdlib in STDLIB_DOCS
147147
end
148148

149149
makedocs(
150-
build = joinpath(pwd(), "_build/html/en"),
150+
build = joinpath(@__DIR__, "_build/html/en"),
151151
modules = [Base, Core, BuildSysImg, [Base.root_module(Base, stdlib.stdlib) for stdlib in STDLIB_DOCS]...],
152152
clean = true,
153153
doctest = "doctest" in ARGS,

doc/src/base/base.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ Base.withenv
245245
Base.pipeline(::Any, ::Any, ::Any, ::Any...)
246246
Base.pipeline(::Base.AbstractCmd)
247247
Base.Libc.gethostname
248-
Base.getipaddr
249248
Base.Libc.getpid
250249
Base.Libc.time()
251250
Base.time_ns
@@ -291,7 +290,6 @@ Base.MissingException
291290
Core.OutOfMemoryError
292291
Core.ReadOnlyMemoryError
293292
Core.OverflowError
294-
Base.ParseError
295293
Core.StackOverflowError
296294
Base.SystemError
297295
Core.TypeError
@@ -336,6 +334,7 @@ Meta.lower
336334
Meta.@lower
337335
Meta.parse(::AbstractString, ::Int)
338336
Meta.parse(::AbstractString)
337+
Meta.ParseError
339338
Base.macroexpand
340339
Base.@macroexpand
341340
Base.@macroexpand1

doc/src/base/collections.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ Base.keys
203203
Base.values
204204
Base.pairs
205205
Base.merge
206-
Base.merge!(::Associative, ::Associative...)
207-
Base.merge!(::Function, ::Associative, ::Associative...)
206+
Base.merge!(::AbstractDict, ::AbstractDict...)
207+
Base.merge!(::Function, ::AbstractDict, ::AbstractDict...)
208208
Base.sizehint!
209209
Base.keytype
210210
Base.valtype

doc/src/devdocs/reflection.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,13 @@ julia> Meta.lower(@__MODULE__, :(f() = 1) )
113113

114114
Inspecting the lowered form for functions requires selection of the specific method to display,
115115
because generic functions may have many methods with different type signatures. For this purpose,
116-
method-specific code-lowering is available using [`code_lowered(f::Function, (Argtypes...))`](@ref),
117-
and the type-inferred form is available using [`code_typed(f::Function, (Argtypes...))`](@ref).
118-
[`code_warntype(f::Function, (Argtypes...))`](@ref) adds highlighting to the output of [`code_typed`](@ref)
119-
(see [`@code_warntype`](@ref)).
116+
method-specific code-lowering is available using [`code_lowered`](@ref),
117+
and the type-inferred form is available using [`code_typed`](@ref).
118+
[`code_warntype`](@ref) adds highlighting to the output of [`code_typed`](@ref).
120119

121120
Closer to the machine, the LLVM intermediate representation of a function may be printed using
122-
by [`code_llvm(f::Function, (Argtypes...))`](@ref), and finally the compiled machine code is available
123-
using [`code_native(f::Function, (Argtypes...))`](@ref) (this will trigger JIT compilation/code
121+
by [`code_llvm`](@ref), and finally the compiled machine code is available
122+
using [`code_native`](@ref) (this will trigger JIT compilation/code
124123
generation for any function which has not previously been called).
125124

126125
For convenience, there are macro versions of the above functions which take standard function
@@ -137,4 +136,5 @@ top:
137136
}
138137
```
139138

140-
(likewise `@code_typed`, `@code_warntype`, `@code_lowered`, and `@code_native`)
139+
See [`@code_lowered`](@ref), [`@code_typed`](@ref), [`@code_warntype`](@ref),
140+
[`@code_llvm`](@ref), and [`@code_native`](@ref).

0 commit comments

Comments
 (0)