Skip to content

Commit 6cd974f

Browse files
authored
Merge pull request #40150 from JuliaLang/backports-release-1.6
Backports for release 1.6.0
2 parents 23267f0 + 45b1b15 commit 6cd974f

File tree

11 files changed

+28
-22
lines changed

11 files changed

+28
-22
lines changed

NEWS.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ New library features
114114
inserting or consuming the first dimension depending on the ratio of `sizeof(T)` and `sizeof(S)`.
115115
* New `append!(vector, collections...)` and `prepend!(vector, collections...)` methods accept multiple
116116
collections to be appended or prepended ([#36227]).
117-
* The postfix operator `'ᵀ` can now be used as an alias for `transpose` ([#38062]).
118117
* `keys(io::IO)` has been added, which returns all keys of `io` if `io` is an `IOContext` and an empty
119118
`Base.KeySet` otherwise ([#37753]).
120119
* `count` now accepts an optional `init` argument to control the accumulation type ([#37461]).

base/exports.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,6 @@ export
467467
# linear algebra
468468
var"'", # to enable syntax a' for adjoint
469469
adjoint,
470-
var"'ᵀ",
471470
transpose,
472471
kron,
473472
kron!,

base/operators.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,6 @@ end
567567
function kron! end
568568

569569
const var"'" = adjoint
570-
const var"'ᵀ" = transpose
571570

572571
"""
573572
\\(x, y)

base/timing.jl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ allocations, and the total number of bytes its execution caused to be allocated,
172172
returning the value of the expression. Any time spent garbage collecting (gc) or
173173
compiling is shown as a percentage.
174174
175+
In some cases the system will look inside the `@time` expression and compile some of the
176+
called code before execution of the top-level expression begins. When that happens, some
177+
compilation time will not be counted. To include this time you can run `@time @eval ...`.
178+
175179
See also [`@timev`](@ref), [`@timed`](@ref), [`@elapsed`](@ref), and
176180
[`@allocated`](@ref).
177181
@@ -264,6 +268,10 @@ end
264268
A macro to evaluate an expression, discarding the resulting value, instead returning the
265269
number of seconds it took to execute as a floating-point number.
266270
271+
In some cases the system will look inside the `@elapsed` expression and compile some of the
272+
called code before execution of the top-level expression begins. When that happens, some
273+
compilation time will not be counted. To include this time you can run `@elapsed @eval ...`.
274+
267275
See also [`@time`](@ref), [`@timev`](@ref), [`@timed`](@ref),
268276
and [`@allocated`](@ref).
269277
@@ -323,6 +331,10 @@ A macro to execute an expression, and return the value of the expression, elapse
323331
total bytes allocated, garbage collection time, and an object with various memory allocation
324332
counters.
325333
334+
In some cases the system will look inside the `@timed` expression and compile some of the
335+
called code before execution of the top-level expression begins. When that happens, some
336+
compilation time will not be counted. To include this time you can run `@timed @eval ...`.
337+
326338
See also [`@time`](@ref), [`@timev`](@ref), [`@elapsed`](@ref), and
327339
[`@allocated`](@ref).
328340

deps/p7zip.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $(BUILDDIR)/p7zip-$(P7ZIP_VER)/source-extracted: $(SRCCACHE)/p7zip-$(P7ZIP_VER).
99
$(JLCHECKSUM) $<
1010
mkdir -p $(dir $@)
1111
cd $(dir $@) && $(TAR) --strip-components 1 -jxf $<
12-
echo $1 > $@
12+
echo 1 > $@
1313

1414
checksum-p7zip: $(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.bz2
1515
$(JLCHECKSUM) $<

deps/pcre.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted: $(SRCCACHE)/pcre2-$(PCRE_VER).ta
1414
cp $(SRCDIR)/patches/config.sub $(SRCCACHE)/pcre2-$(PCRE_VER)/config.sub
1515
cd $(SRCCACHE)/pcre2-$(PCRE_VER) && patch -p1 -f < $(SRCDIR)/patches/pcre2-cet-flags.patch
1616
# Fix some old targets modified by the patching
17+
touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/aclocal.m4
1718
touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/Makefile.am
1819
touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/Makefile.in
19-
touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/aclocal.m4
2020
touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/configure
21-
echo $1 > $@
21+
echo 1 > $@
2222

2323
checksum-pcre2: $(SRCCACHE)/pcre2-$(PCRE_VER).tar.bz2
2424
$(JLCHECKSUM) $<

stdlib/LinearAlgebra/src/adjtrans.jl

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ julia> x'x
136136
adjoint(A::AbstractVecOrMat) = Adjoint(A)
137137

138138
"""
139-
A'ᵀ
140139
transpose(A)
141140
142141
Lazy transpose. Mutating the returned object should appropriately mutate `A`. Often,
@@ -146,9 +145,6 @@ that this operation is recursive.
146145
This operation is intended for linear algebra usage - for general data manipulation see
147146
[`permutedims`](@ref Base.permutedims), which is non-recursive.
148147
149-
!!! compat "Julia 1.6"
150-
The postfix operator `'ᵀ` requires Julia 1.6.
151-
152148
# Examples
153149
```jldoctest
154150
julia> A = [3+2im 9+2im; 8+7im 4+6im]
@@ -160,14 +156,6 @@ julia> transpose(A)
160156
2×2 transpose(::Matrix{Complex{Int64}}) with eltype Complex{Int64}:
161157
3+2im 8+7im
162158
9+2im 4+6im
163-
164-
julia> x = [3, 4im]
165-
2-element Vector{Complex{Int64}}:
166-
3 + 0im
167-
0 + 4im
168-
169-
julia> x'ᵀx
170-
-7 + 0im
171159
```
172160
"""
173161
transpose(A::AbstractVecOrMat) = Transpose(A)

stdlib/Markdown/src/render/terminal/formatting.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ wrapped_lines(io::IO, f::Function, args...; width = 80, i = 0) =
4242

4343
function print_wrapped(io::IO, s...; width = 80, pre = "", i = 0)
4444
lines = wrapped_lines(io, s..., width = width, i = i)
45+
isempty(lines) && return 0, 0
4546
print(io, lines[1])
4647
for line in lines[2:end]
4748
print(io, '\n', pre, line)

stdlib/Markdown/test/runtests.jl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,3 +1213,12 @@ end
12131213
| $x |
12141214
""")
12151215
end
1216+
1217+
@testset "issue 40080: empty list item breaks display()" begin
1218+
d = TextDisplay(devnull)
1219+
display(d, md"""
1220+
1. hello
1221+
2.
1222+
""")
1223+
end
1224+

stdlib/Random/docs/src/index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ type, which is a wrapper over the OS provided entropy.
1313
Most functions related to random generation accept an optional `AbstractRNG` object as first argument,
1414
which defaults to the global one if not provided. Moreover, some of them accept optionally
1515
dimension specifications `dims...` (which can be given as a tuple) to generate arrays of random
16-
values.
16+
values. In a multi-threaded program, you should generally use different RNG objects from different threads
17+
in order to be thread-safe. However, the default global RNG is thread-safe as of Julia 1.3 (because
18+
it internally corresponds to a per-thread RNG).
1719

1820
A `MersenneTwister` or `RandomDevice` RNG can generate uniformly random numbers of the following types:
1921
[`Float16`](@ref), [`Float32`](@ref), [`Float64`](@ref), [`BigFloat`](@ref), [`Bool`](@ref),

0 commit comments

Comments
 (0)