From 4c70b0af5431b43b37786307c70278faf16bc257 Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Thu, 27 Jul 2023 19:06:46 -0400 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Max Horn --- base/Base.jl | 2 +- base/base_jll_adapters.jl | 4 ++-- base/base_jll_insertion.jl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/Base.jl b/base/Base.jl index 1c012c6288d7ae..4d9a2596d5e1d2 100644 --- a/base/Base.jl +++ b/base/Base.jl @@ -498,7 +498,7 @@ include(mapexpr::Function, mod::Module, _path::AbstractString) = _include(mapexp Core.println("JuliaSyntax/src/JuliaSyntax.jl") include(@__MODULE__, "JuliaSyntax/src/JuliaSyntax.jl") -# Finish up by inserting lazy libraries for the JLLS that must be loaded during bootstrap +# Finish up by inserting lazy libraries for the JLLs that must be loaded during bootstrap include(@__MODULE__, "base_jll_insertion.jl") end_base_include = time_ns() diff --git a/base/base_jll_adapters.jl b/base/base_jll_adapters.jl index a8a63d7c33c8fc..8e28ecce291c7c 100644 --- a/base/base_jll_adapters.jl +++ b/base/base_jll_adapters.jl @@ -1,6 +1,6 @@ # This file serves as a way to provide access to libraries that Base needs # that are usually included as artifacts. We can't use Artifacts this early -# becuase we haven't bootstrapped far enough, so this file contains "Base" +# because we haven't bootstrapped far enough, so this file contains "Base" # JLLs that are manually adapted to load things from hardcoded paths so that # we can bootstrap, but once GMP_jll, MPFR_jll, etc... are loaded, we replace # the definitions here with the `LazyLibrary` objects defined there, as they @@ -42,7 +42,7 @@ Base.cconvert(::Type{Cstring}, llp::LazyLibraryPath) = Base.cconvert(Cstring, st Base.print(io::IO, llp::LazyLibraryPath) = print(io, string(llp)) # Helper to get `Sys.BINDIR` at runtime -struct SysBindirGetter; end +struct SysBindirGetter end Base.string(::SysBindirGetter) = string(ccall(:jl_get_julia_bindir, Any, ())::String, early_pathsep, "..") """ diff --git a/base/base_jll_insertion.jl b/base/base_jll_insertion.jl index b3f4ef7c651415..c2ae4b4cfa8d9c 100644 --- a/base/base_jll_insertion.jl +++ b/base/base_jll_insertion.jl @@ -1,4 +1,4 @@ -# Insert LazyLibrary for `libpcre`, although at this time this gets lazily +# Insert LazyLibrary for `libpcre`, although at this time this gets lazily loaded # on startup because `include()` calls `isdirpath()` which has a regex in it. using Base.JLLAdapters: libpcre2_8, libpcre2_8_name using Base.Libc.Libdl: BundledLazyLibraryPath, LazyLibrary