From a6d745005fd275dfc559fb77948eb440f914e79f Mon Sep 17 00:00:00 2001 From: Kristoffer Date: Wed, 7 Dec 2022 18:31:35 +0100 Subject: [PATCH] review fixes --- docs/src/creating-packages.md | 6 +++--- src/Operations.jl | 2 +- src/Pkg.jl | 2 +- src/Types.jl | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/src/creating-packages.md b/docs/src/creating-packages.md index caf6a5c7db..f6149a380d 100644 --- a/docs/src/creating-packages.md +++ b/docs/src/creating-packages.md @@ -251,7 +251,7 @@ This is an important topic so there is a separate chapter about it: [Compatibili This is a somewhat advanced usage of Pkg which can be skipped for people new to Julia and Julia packages. A weak dependency is a dependency that will not automatically install when the package is installed but -you can still control what versions of that package is allowed to install by setting compatibility on it. +you can still control what versions of that package are allowed to be installed by setting compatibility on it. These are listed in the project file under the `[weakdeps]` section: ```toml @@ -355,7 +355,7 @@ This section discusses various methods for using extensions on Julia versions th while simultaneously providing similar functionality on older Julia versions. #### Requires.jl -This section is relevant if you are currently using Requries.jl but want to transition to using extensions (while still having Requires be used on Julia versions that do not support extensions). +This section is relevant if you are currently using Requires.jl but want to transition to using extensions (while still having Requires be used on Julia versions that do not support extensions). This is done by making the following changes (using the example above): - Add the following to the package file. This makes it so that Requires.jl loads and inserts the @@ -365,7 +365,7 @@ This is done by making the following changes (using the example above): if !isdefined(Base, :get_extension) using Requires function __init__() - @require Contour = "d38c429a-6771-53c6-b99e-75d170b6e991" include("../ext/ContourExt.jl) + @require Contour = "d38c429a-6771-53c6-b99e-75d170b6e991" include("../ext/ContourExt.jl") end end ``` diff --git a/src/Operations.jl b/src/Operations.jl index 89e2642095..8bf0ba8211 100644 --- a/src/Operations.jl +++ b/src/Operations.jl @@ -149,7 +149,7 @@ function update_manifest!(env::EnvCache, pkgs::Vector{PackageSpec}, deps_map, ju end # This has to be done after the packages have been downloaded -# since we need access to the Projet file to read the information +# since we need access to the Project file to read the information # about extensions function fixup_ext!(env, pkgs) for pkg in pkgs diff --git a/src/Pkg.jl b/src/Pkg.jl index a841dfd700..56137a5a21 100644 --- a/src/Pkg.jl +++ b/src/Pkg.jl @@ -419,7 +419,7 @@ from packages that are tracking a path. const resolve = API.resolve """ - Pkg.status([pkgs...]; outdated::Bool=false, mode::PackageMode=PKGMODE_PROJECT, diff::Bool=false, compat::Bool=false, ext::Bool=false io::IO=stdout) + Pkg.status([pkgs...]; outdated::Bool=false, mode::PackageMode=PKGMODE_PROJECT, diff::Bool=false, compat::Bool=false, ext::Bool=false, io::IO=stdout) Print out the status of the project/manifest. diff --git a/src/Types.jl b/src/Types.jl index 5d1d6987f8..a24770f05d 100644 --- a/src/Types.jl +++ b/src/Types.jl @@ -284,7 +284,7 @@ Base.:(==)(t1::PackageEntry, t2::PackageEntry) = t1.name == t2.name && t1.exts == t2.exts && t1.uuid == t2.uuid # omits `other` -Base.hash(x::PackageEntry, h::UInt) = foldr(hash, [x.name, x.version, x.path, x.pinned, x.repo, x.tree_hash, x.deps, x.weakdeps,x.exts, x.uuid], init=h) # omits `other` +Base.hash(x::PackageEntry, h::UInt) = foldr(hash, [x.name, x.version, x.path, x.pinned, x.repo, x.tree_hash, x.deps, x.weakdeps ,x.exts, x.uuid], init=h) # omits `other` Base.@kwdef mutable struct Manifest julia_version::Union{Nothing,VersionNumber} = nothing # only set to VERSION when resolving