Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f358223

Browse files
authoredAug 22, 2017
Merge branch 'master' into ver
2 parents a65b88c + f731c9d commit f358223

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1306
-676
lines changed
 

‎NEWS.md

+9
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ Language changes
7070
warning, so that this syntax can be disallowed or given a new meaning in a
7171
future version ([#5148]).
7272

73+
* In `for i in x`, `x` used to be evaluated in a new scope enclosing the `for` loop.
74+
Now it is evaluated in the scope outside the `for` loop.
75+
7376
Breaking changes
7477
----------------
7578

@@ -318,6 +321,9 @@ Deprecated or removed
318321
* `Base.cpad` has been removed; use an appropriate combination of `rpad` and `lpad`
319322
instead ([#23187]).
320323

324+
* `ctranspose` and `ctranspose!` have been deprecated in favor of `adjoint` and `adjoint!`,
325+
respectively ([#23235]).
326+
321327
* `filter` and `filter!` on dictionaries now pass a single `key=>value` pair to the
322328
argument function, instead of two arguments ([#17886]).
323329

@@ -327,6 +333,9 @@ Deprecated or removed
327333
have been renamed to `GMP.version()`, `GMP.VERSION`, `GMP.bits_per_libm()`, and `GMP.BITS_PER_LIBM`,
328334
respectively. Similarly, `MPFR.get_version()`, has been renamed to `MPFR.version()` ([#23323]).
329335

336+
* `diagm(A::SparseMatrixCSC)` has been deprecated in favor of
337+
`spdiagm(sparsevec(A))` ([#23341]).
338+
330339
Command-line option changes
331340
---------------------------
332341

‎base/channels.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ julia> take!(c)
196196
julia> put!(c,1);
197197
ERROR: foo
198198
Stacktrace:
199-
[1] check_channel_state(::Channel{Any}) at ./channels.jl:131
200-
[2] put!(::Channel{Any}, ::Int64) at ./channels.jl:261
199+
[1] check_channel_state at ./channels.jl:132 [inlined]
200+
[2] put!(::Channel{Any}, ::Int64) at ./channels.jl:263
201201
```
202202
"""
203203
function bind(c::Channel, task::Task)

0 commit comments

Comments
 (0)