Skip to content

[pull] master from JuliaLang:master #2149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Dec 2, 2025
Merged

[pull] master from JuliaLang:master #2149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
231c9e0
Fix copy-paste error in effect comparison (#60297)
Keno Dec 2, 2025
9bb8684
Relax timing restriction in pidfile test (#60288)
gbaraldi Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Compiler/src/effects.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ function is_better_effects(new::Effects, old::Effects)
end
end
if new.effect_free == ALWAYS_TRUE
any_improved |= old.consistent != ALWAYS_TRUE
any_improved |= old.effect_free != ALWAYS_TRUE
elseif new.effect_free == EFFECT_FREE_IF_INACCESSIBLEMEMONLY
old.effect_free == ALWAYS_TRUE && return false
any_improved |= old.effect_free != EFFECT_FREE_IF_INACCESSIBLEMEMONLY
Expand Down
2 changes: 1 addition & 1 deletion stdlib/FileWatching/test/pidfile.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ end
@test t < 2
t = @elapsed f = open_exclusive("pidfile", poll_interval=3, stale_age=10)::File
close(f)
@test 8 < t < 20
@test 8 < t < 25
rm("pidfile")
end

Expand Down
Loading