Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: JuliaLang/julia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7a76ed158464e65f066052f577e44fed098dcf08
Choose a base ref
..
head repository: JuliaLang/julia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d5d8a17111e1bb5c91ccfce72b7a717d858acbbc
Choose a head ref
Showing with 14 additions and 15 deletions.
  1. +5 −6 doc/Manifest.toml
  2. +6 −6 stdlib/Manifest.toml
  3. +0 −1 stdlib/REPL/Project.toml
  4. +3 −1 stdlib/REPL/src/Pkg_beforeload.jl
  5. +0 −1 stdlib/REPL/src/REPL.jl
11 changes: 5 additions & 6 deletions doc/Manifest.toml
View file
Original file line number Diff line number Diff line change
@@ -99,11 +99,6 @@ git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a"
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
version = "0.21.4"

[[deps.JuliaSyntaxHighlighting]]
deps = ["StyledStrings"]
uuid = "dc6e5ff7-fb65-4e79-a425-ec3bc9c03011"
version = "1.11.0"

[[deps.LazilyInitializedFields]]
git-tree-sha1 = "8f7f3cabab0fd1800699663533b6d5cb3fc0e612"
uuid = "0e77f7df-68c5-4e49-93ce-4cd80f5598bf"
@@ -119,6 +114,10 @@ deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
version = "8.6.0+0"

[[deps.JuliaSyntaxHighlighting]]
deps = ["StyledStrings"]
uuid = "dc6e5ff7-fb65-4e79-a425-ec3bc9c03011"

[[deps.LibGit2]]
deps = ["LibGit2_jll", "NetworkOptions", "Printf", "SHA"]
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
@@ -220,7 +219,7 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
version = "1.11.0"

[[deps.REPL]]
deps = ["InteractiveUtils", "Markdown", "Sockets", "StyledStrings", "TOML", "Unicode"]
deps = ["InteractiveUtils", "Markdown", "Sockets", "StyledStrings", "Unicode"]
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
version = "1.11.0"

12 changes: 6 additions & 6 deletions stdlib/Manifest.toml
View file
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ version = "1.11.0"
[[deps.LLD_jll]]
deps = ["Artifacts", "Libdl", "Zlib_jll", "libLLVM_jll"]
uuid = "d55e3150-da41-5e91-b323-ecfd1eec6109"
version = "17.0.6+4"
version = "16.0.6+4"

[[deps.LLVMLibUnwind_jll]]
deps = ["Artifacts", "Libdl"]
@@ -163,7 +163,7 @@ version = "1.2.0"
[[deps.OpenBLAS_jll]]
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
version = "0.3.27+1"
version = "0.3.26+2"

[[deps.OpenLibm_jll]]
deps = ["Artifacts", "Libdl"]
@@ -194,7 +194,7 @@ uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
version = "1.11.0"

[[deps.REPL]]
deps = ["InteractiveUtils", "Markdown", "Sockets", "StyledStrings", "TOML", "Unicode"]
deps = ["InteractiveUtils", "Markdown", "Sockets", "StyledStrings", "Unicode"]
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
version = "1.11.0"

@@ -223,7 +223,7 @@ version = "1.11.0"
[[deps.SparseArrays]]
deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"]
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
version = "1.12.0"
version = "1.11.0"

[[deps.Statistics]]
deps = ["LinearAlgebra"]
@@ -281,12 +281,12 @@ version = "2.2.5+0"
[[deps.libLLVM_jll]]
deps = ["Artifacts", "Libdl"]
uuid = "8f36deef-c2a5-5394-99ed-8e07531fb29a"
version = "17.0.6+4"
version = "16.0.6+4"

[[deps.libblastrampoline_jll]]
deps = ["Artifacts", "Libdl"]
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
version = "5.9.0+0"
version = "5.8.0+1"

[[deps.nghttp2_jll]]
deps = ["Artifacts", "Libdl"]
1 change: 0 additions & 1 deletion stdlib/REPL/Project.toml
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@ InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
StyledStrings = "f489334b-da3d-4c2e-b8f0-e476e12c162b"
TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

[extras]
4 changes: 3 additions & 1 deletion stdlib/REPL/src/Pkg_beforeload.jl
View file
Original file line number Diff line number Diff line change
@@ -69,7 +69,9 @@ function relative_project_path(project_file::String, path::String)
end

function projname(project_file::String)
proj = TOML.parse(read(project_file, String))
p = Base.TOML.Parser()
Base.TOML.reinit!(p, read(project_file, String); filepath=project_file)
proj = Base.TOML.parse(p)
name = get(proj, "name", nothing)
if name === nothing
name = basename(dirname(project_file))
1 change: 0 additions & 1 deletion stdlib/REPL/src/REPL.jl
View file
Original file line number Diff line number Diff line change
@@ -151,7 +151,6 @@ using .REPLCompletions
include("TerminalMenus/TerminalMenus.jl")
include("docview.jl")

import TOML
include("Pkg_beforeload.jl")

@nospecialize # use only declared type signatures