Skip to content

Commit 4f2e983

Browse files
committed
Merge branch 'master' of github.com:JuliaLang/julia
2 parents 205b260 + 70a5901 commit 4f2e983

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

HISTORY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ Compiler/Runtime improvements
6464
Code that requires assumptions about object layout and addresses (usually for
6565
interoperability with C or other languages) might need to be updated; for
6666
example any object that needs a stable address should be a `mutable struct`.
67+
As a result, Array `view`s no longer allocate ([#34126]).
6768

6869
Command-line option changes
6970
---------------------------

base/logging.jl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,12 @@ Severity/verbosity of a log record.
105105
The log level provides a key against which potential log records may be
106106
filtered, before any other work is done to construct the log record data
107107
structure itself.
108+
109+
# Examples
110+
```
111+
julia> Logging.LogLevel(0) == Logging.Info
112+
true
113+
```
108114
"""
109115
struct LogLevel
110116
level::Int32
@@ -420,6 +426,11 @@ end
420426
Disable all log messages at log levels equal to or less than `level`. This is
421427
a *global* setting, intended to make debug logging extremely cheap when
422428
disabled.
429+
430+
# Examples
431+
```
432+
Logging.disable_logging(Logging.Info) # Disable debug and info
433+
```
423434
"""
424435
function disable_logging(level::LogLevel)
425436
_min_enabled_level[] = level + 1

0 commit comments

Comments
 (0)