From 417adc77e81190e2b143c699ca2484b0dd9e8f96 Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 8 Jan 2024 14:20:40 -0600 Subject: [PATCH 01/17] Allow `using Mod as M`, don't export module name by default, and explicitly load module name on `using Mod` or `using Mod as M` --- src/module.c | 7 +++++-- src/toplevel.c | 32 ++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/module.c b/src/module.c index db1d86aa4a3ce..e5c301bd17ab4 100644 --- a/src/module.c +++ b/src/module.c @@ -45,9 +45,12 @@ JL_DLLEXPORT jl_module_t *jl_new_module_(jl_sym_t *name, jl_module_t *parent, ui if (jl_core_module && default_names) { JL_GC_PUSH1(&m); jl_module_using(m, jl_core_module); - // export own name, so "using Foo" makes "Foo" itself visible + // import_module(m, jl_core_module, NULL); + // Do not export own name, "using Foo" already makes "Foo" itself visible + // and "using Foo as Bar" should not make the name "Foo" visible. + // But do make it public so it appears in `names(Foo)`. jl_set_const(m, name, (jl_value_t*)m); - jl_module_public(m, name, 1); + jl_module_public(m, name, 0); JL_GC_POP(); } return m; diff --git a/src/toplevel.c b/src/toplevel.c index cb078a05d0ce4..bf740cd1781a3 100644 --- a/src/toplevel.c +++ b/src/toplevel.c @@ -36,12 +36,15 @@ jl_mutex_t jl_modules_mutex; // During incremental compilation, the following gets set JL_DLLEXPORT jl_module_t *jl_precompile_toplevel_module = NULL; // the toplevel module currently being defined +static void import_module(jl_module_t *JL_NONNULL m, jl_module_t *import, jl_sym_t *asname); + JL_DLLEXPORT void jl_add_standard_imports(jl_module_t *m) { jl_module_t *base_module = jl_base_relative_to(m); assert(base_module != NULL); // using Base jl_module_using(m, base_module); + import_module(m, base_module, NULL); } // create a new top-level module @@ -759,35 +762,40 @@ jl_value_t *jl_toplevel_eval_flex(jl_module_t *JL_NONNULL m, jl_value_t *e, int if (name != NULL) u = (jl_module_t*)jl_eval_global_var(import, name); if (from) { - // `using A: B` syntax + // `using A: B` and `using A: B.c` syntax jl_module_use(m, import, name); } else { if (!jl_is_module(u)) jl_eval_errorf(m, "invalid using path: \"%s\" does not name a module", jl_symbol_name(name)); - // `using A.B` syntax + // `using A` and `using A.B` syntax jl_module_using(m, u); - if (m == jl_main_module && name == NULL) { - // TODO: for now, `using A` in Main also creates an explicit binding for `A` - // This will possibly be extended to all modules. - import_module(m, u, NULL); - } + import_module(m, u, name); } continue; } - else if (from && jl_is_expr(a) && ((jl_expr_t*)a)->head == jl_as_sym && jl_expr_nargs(a) == 2 && + else if (jl_is_expr(a) && ((jl_expr_t*)a)->head == jl_as_sym && jl_expr_nargs(a) == 2 && jl_is_expr(jl_exprarg(a, 0)) && ((jl_expr_t*)jl_exprarg(a, 0))->head == jl_dot_sym) { jl_sym_t *asname = (jl_sym_t*)jl_exprarg(a, 1); if (jl_is_symbol(asname)) { jl_expr_t *path = (jl_expr_t*)jl_exprarg(a, 0); name = NULL; jl_module_t *import = eval_import_path(m, from, ((jl_expr_t*)path)->args, &name, "using"); - assert(name); check_macro_rename(name, asname, "using"); - // `using A: B as C` syntax - jl_module_use_as(m, import, name, asname); - continue; + if (from) { + // `using A: B as C` and `using A: B.C as D` syntax + assert(name); + jl_module_use_as(m, import, name, asname); + continue; + } + else { + // `using A as B` and `using A.B as C syntax + assert(name == NULL); + jl_module_using(m, import); + import_module(m, import, asname); + continue; + } } } jl_eval_errorf(m, "syntax: malformed \"using\" statement"); From 3b8b7544a366eeda37617adfabc0aaf02975790a Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 8 Jan 2024 14:22:54 -0600 Subject: [PATCH 02/17] bump Pkg to un-merged version without `module Mod; using Mod; end` --- stdlib/Pkg.version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/Pkg.version b/stdlib/Pkg.version index f7b6068e3768c..5dde0a1692045 100644 --- a/stdlib/Pkg.version +++ b/stdlib/Pkg.version @@ -1,4 +1,4 @@ -PKG_BRANCH = master -PKG_SHA1 = 3c86ba27e904807e13beb8cb0466ed70365b0b2d +PKG_BRANCH = lh/remove-using-same-name +PKG_SHA1 = 74d105303f91ded5b730856cc54aa36bd9972809 PKG_GIT_URL := https://github.com/JuliaLang/Pkg.jl.git PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1 From 06f0512a13b69fc985c95eeadb9b6447d69be306 Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 8 Jan 2024 15:04:50 -0600 Subject: [PATCH 03/17] fix check_macro_name segfault --- src/toplevel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/toplevel.c b/src/toplevel.c index bf740cd1781a3..234f5f32cf3f8 100644 --- a/src/toplevel.c +++ b/src/toplevel.c @@ -782,16 +782,17 @@ jl_value_t *jl_toplevel_eval_flex(jl_module_t *JL_NONNULL m, jl_value_t *e, int jl_expr_t *path = (jl_expr_t*)jl_exprarg(a, 0); name = NULL; jl_module_t *import = eval_import_path(m, from, ((jl_expr_t*)path)->args, &name, "using"); - check_macro_rename(name, asname, "using"); if (from) { // `using A: B as C` and `using A: B.C as D` syntax assert(name); + check_macro_rename(name, asname, "using"); jl_module_use_as(m, import, name, asname); continue; } else { // `using A as B` and `using A.B as C syntax assert(name == NULL); + check_macro_rename(import->name, asname, "using"); jl_module_using(m, import); import_module(m, import, asname); continue; From db6fdd13598bbd13b2ff12e4169f31ee61ad62d0 Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 8 Jan 2024 15:07:56 -0600 Subject: [PATCH 04/17] bump JuliaSyntax to an unmerged version with this feature --- deps/JuliaSyntax.version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/JuliaSyntax.version b/deps/JuliaSyntax.version index 7f124715024ce..aa5a12127e418 100644 --- a/deps/JuliaSyntax.version +++ b/deps/JuliaSyntax.version @@ -1,4 +1,4 @@ -JULIASYNTAX_BRANCH = main -JULIASYNTAX_SHA1 = 4f1731d6ce7c2465fc21ea245110b7a39f34658a +JULIASYNTAX_BRANCH = lh/using-as +JULIASYNTAX_SHA1 = d3cc52a1f8f27d145517484db80e6ff20619aa00 JULIASYNTAX_GIT_URL := https://github.com/JuliaLang/JuliaSyntax.jl.git JULIASYNTAX_TAR_URL = https://api.github.com/repos/JuliaLang/JuliaSyntax.jl/tarball/$1 From dab5bdc584ece2755fb5ce01ccddd36b431a2ec7 Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 8 Jan 2024 15:27:57 -0600 Subject: [PATCH 05/17] add tests --- test/reflection.jl | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/test/reflection.jl b/test/reflection.jl index d866749e12d34..380d212c19548 100644 --- a/test/reflection.jl +++ b/test/reflection.jl @@ -217,6 +217,7 @@ public this_is_public @test isexported(@__MODULE__, :this_is_not_defined) @test !isexported(@__MODULE__, :this_is_not_exported) @test !isexported(@__MODULE__, :this_is_public) +@test !isexported(@__MODULE__, :TestingExported) const a_value = 1 @test which(@__MODULE__, :a_value) === @__MODULE__ @test_throws ErrorException("\"a_value\" is not defined in module Main") which(Main, :a_value) @@ -226,6 +227,7 @@ const a_value = 1 @test Base.ispublic(@__MODULE__, :this_is_not_defined) @test Base.ispublic(@__MODULE__, :this_is_public) @test !Base.ispublic(@__MODULE__, :this_is_not_exported) +@test !Base.ispublic(@__MODULE__, :TestingExported) end # PR 13825 @@ -1180,3 +1182,34 @@ let (src, rt) = only(code_typed(sub2ind_gen, (NTuple,Int,Int,); optimize=false)) @test any(iscall((src,sub2ind_gen_fallback)), src.code) @test any(iscall((src,error)), src.code) end + +# `using Mod as M` +module Mod52821 + +using Test + +module M1 + module M2 + export f52821 + f52821() = 7 + g52821() = 8 + end +end + +@test_throws UndefVarError f52821() +using .M1.M2 as Mod +@test f52821() === 7 # Export mechanism works <----------- BROKEN!!! +@test_throws UndefVarError f52821() # Unexported things don't get loaded +@test !isdefined(@__MODULE__, :M2) # Does not load the name M2 into Main +@test Mod === M1.M2 === Mod.M2 # Does load M2 under the aliased name <----------- BROKEN!!! +const M2 = 4 # We can still use the name M2 +@test M2 == 4 + +@test_throws UndefVarError mean([0]) +using Statistics as Stats +@test mean([0]) == 0 +@test Stats.mean === mean +@test Stats === Stats.Statistics +@test_throws UndefVarError Statistics.mean([0]) + +end From d8b164269469ac1228526b9523052d41fddb8ece Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 8 Jan 2024 15:42:24 -0600 Subject: [PATCH 06/17] fix tests --- src/toplevel.c | 3 ++- test/reflection.jl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/toplevel.c b/src/toplevel.c index 234f5f32cf3f8..398b42a38360f 100644 --- a/src/toplevel.c +++ b/src/toplevel.c @@ -791,7 +791,8 @@ jl_value_t *jl_toplevel_eval_flex(jl_module_t *JL_NONNULL m, jl_value_t *e, int } else { // `using A as B` and `using A.B as C syntax - assert(name == NULL); + if (name != NULL) + import = (jl_module_t*)jl_eval_global_var(import, name); check_macro_rename(import->name, asname, "using"); jl_module_using(m, import); import_module(m, import, asname); diff --git a/test/reflection.jl b/test/reflection.jl index 1808238b80421..318699d0d5538 100644 --- a/test/reflection.jl +++ b/test/reflection.jl @@ -1210,10 +1210,10 @@ end @test_throws UndefVarError f52821() using .M1.M2 as Mod -@test f52821() === 7 # Export mechanism works <----------- BROKEN!!! +@test f52821() === 7 # Export mechanism works @test_throws UndefVarError f52821() # Unexported things don't get loaded @test !isdefined(@__MODULE__, :M2) # Does not load the name M2 into Main -@test Mod === M1.M2 === Mod.M2 # Does load M2 under the aliased name <----------- BROKEN!!! +@test Mod === M1.M2 === Mod.M2 # Does load M2 under the aliased name const M2 = 4 # We can still use the name M2 @test M2 == 4 From e249bdaabd0e869a1ec14fd866f4255e519aaa82 Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 8 Jan 2024 15:50:42 -0600 Subject: [PATCH 07/17] Add more tests --- test/syntax.jl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/syntax.jl b/test/syntax.jl index 4d204f3e29364..f63bb120dfe83 100644 --- a/test/syntax.jl +++ b/test/syntax.jl @@ -2677,6 +2677,10 @@ import .Mod.@mac as @m @test_throws ErrorException eval(:(using .Mod: @mac as notmacro)) @test_throws ErrorException eval(:(using .Mod: func as @notmacro)) +@test_throws ErrorException eval(:(using .Mod as @M)) +e = @test_throws ErrorException eval(:(using .Mod.Mod2 as @M)) +@test occursin("Mod2", e.value.msg) + import .Mod2.x_from_mod @test @isdefined(x_from_mod) From 7bab69274251cff7830bdd9d3ee1942fe47d2161 Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 8 Jan 2024 15:53:28 -0600 Subject: [PATCH 08/17] fix typo in tests --- test/reflection.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/reflection.jl b/test/reflection.jl index 318699d0d5538..c4f2e0832a3ea 100644 --- a/test/reflection.jl +++ b/test/reflection.jl @@ -1211,7 +1211,7 @@ end @test_throws UndefVarError f52821() using .M1.M2 as Mod @test f52821() === 7 # Export mechanism works -@test_throws UndefVarError f52821() # Unexported things don't get loaded +@test_throws UndefVarError g52821() # Unexported things don't get loaded @test !isdefined(@__MODULE__, :M2) # Does not load the name M2 into Main @test Mod === M1.M2 === Mod.M2 # Does load M2 under the aliased name const M2 = 4 # We can still use the name M2 From 249f0150bc7ebac05513ca25e398e52ad68bd60e Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 8 Jan 2024 15:57:14 -0600 Subject: [PATCH 09/17] add NEWS.md entry --- NEWS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS.md b/NEWS.md index 34e69535374b0..21557fa29cde9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -7,6 +7,7 @@ New language features API. Symbols marked with `export` are now also treated as public API. The difference between `public` and `export` is that `public` names do not become available when `using` a package/module ([#50105]). +* The syntax `using LongPackageName as LPN` is now supported ([#52821]). * `ScopedValue` implement dynamic scope with inheritance across tasks ([#50958]). * The new macro `Base.Cartesian.@ncallkw` is analogous to `Base.Cartesian.@ncall`, but allows to add keyword arguments to the function call ([#51501]). @@ -33,6 +34,8 @@ Language changes Meaning that coverage testing (the default for `julia-actions/julia-runtest`) will by default use pkgimage caches for all other packages than the package being tested, likely meaning faster test execution. ([#52123]) +* Module names are no longer considered "exported" by default. Nevertheless they are still + made available with `using`. * Specifying a path in `JULIA_DEPOT_PATH` now results in the expansion of empty strings to omit the default user depot ([#51448]). From c528bb6731a75256d326188036afbc95412c6830 Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 8 Jan 2024 16:00:08 -0600 Subject: [PATCH 10/17] Don't publicize module names --- src/module.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/module.c b/src/module.c index 0d693dac57d42..2414ed6f137fb 100644 --- a/src/module.c +++ b/src/module.c @@ -46,11 +46,9 @@ JL_DLLEXPORT jl_module_t *jl_new_module_(jl_sym_t *name, jl_module_t *parent, ui JL_GC_PUSH1(&m); jl_module_using(m, jl_core_module); // import_module(m, jl_core_module, NULL); - // Do not export own name, "using Foo" already makes "Foo" itself visible - // and "using Foo as Bar" should not make the name "Foo" visible. - // But do make it public so it appears in `names(Foo)`. + // Do not export or publicize own name, "using Foo" already makes "Foo" itself + // visible and "using Foo as Bar" should not make the name "Foo" visible. jl_set_const(m, name, (jl_value_t*)m); - jl_module_public(m, name, 0); JL_GC_POP(); } return m; From 597c0b453a7506d332c1accf3fc38a29bbbdd7fe Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Tue, 9 Jan 2024 09:07:33 -0600 Subject: [PATCH 11/17] check in checksums --- .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 + .../sha512 | 1 + .../Pkg-3c86ba27e904807e13beb8cb0466ed70365b0b2d.tar.gz/md5 | 1 - .../Pkg-3c86ba27e904807e13beb8cb0466ed70365b0b2d.tar.gz/sha512 | 1 - .../Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/md5 | 1 + .../Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/sha512 | 1 + 8 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 deps/checksums/JuliaSyntax-4f1731d6ce7c2465fc21ea245110b7a39f34658a.tar.gz/md5 delete mode 100644 deps/checksums/JuliaSyntax-4f1731d6ce7c2465fc21ea245110b7a39f34658a.tar.gz/sha512 create mode 100644 deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/md5 create mode 100644 deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/sha512 delete mode 100644 deps/checksums/Pkg-3c86ba27e904807e13beb8cb0466ed70365b0b2d.tar.gz/md5 delete mode 100644 deps/checksums/Pkg-3c86ba27e904807e13beb8cb0466ed70365b0b2d.tar.gz/sha512 create mode 100644 deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/md5 create mode 100644 deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/sha512 diff --git a/deps/checksums/JuliaSyntax-4f1731d6ce7c2465fc21ea245110b7a39f34658a.tar.gz/md5 b/deps/checksums/JuliaSyntax-4f1731d6ce7c2465fc21ea245110b7a39f34658a.tar.gz/md5 deleted file mode 100644 index c2663955ec773..0000000000000 --- a/deps/checksums/JuliaSyntax-4f1731d6ce7c2465fc21ea245110b7a39f34658a.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -8c9d9579eeab1ba40f978a32c9db9900 diff --git a/deps/checksums/JuliaSyntax-4f1731d6ce7c2465fc21ea245110b7a39f34658a.tar.gz/sha512 b/deps/checksums/JuliaSyntax-4f1731d6ce7c2465fc21ea245110b7a39f34658a.tar.gz/sha512 deleted file mode 100644 index 46647cb3e432b..0000000000000 --- a/deps/checksums/JuliaSyntax-4f1731d6ce7c2465fc21ea245110b7a39f34658a.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -1bdad624f61482b55deba8727fea1c087bfaea9e1f8afa3b44b984441fb7e663dac067baa4a96ae2d4cbd4a46ae8c87e9d20d2dfcd17046ad194711304184e57 diff --git a/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/md5 b/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/md5 new file mode 100644 index 0000000000000..860c73e7c9da1 --- /dev/null +++ b/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/md5 @@ -0,0 +1 @@ +7dc5532d0857ea08e967fe3dcff84024 diff --git a/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/sha512 b/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/sha512 new file mode 100644 index 0000000000000..793bcf07679ef --- /dev/null +++ b/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/sha512 @@ -0,0 +1 @@ +67e316fa0e4a410b393cc3a521dc770b8c3501a1b056af83b9206b38d430573117e6bb49ce9a3a05a4868f2c4865caacbe2cd5c9dc53871a9868ad8f51fb0f5f diff --git a/deps/checksums/Pkg-3c86ba27e904807e13beb8cb0466ed70365b0b2d.tar.gz/md5 b/deps/checksums/Pkg-3c86ba27e904807e13beb8cb0466ed70365b0b2d.tar.gz/md5 deleted file mode 100644 index 3e7b0ffe63bd8..0000000000000 --- a/deps/checksums/Pkg-3c86ba27e904807e13beb8cb0466ed70365b0b2d.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -5723739fcb31b88a2e2513c05bea2952 diff --git a/deps/checksums/Pkg-3c86ba27e904807e13beb8cb0466ed70365b0b2d.tar.gz/sha512 b/deps/checksums/Pkg-3c86ba27e904807e13beb8cb0466ed70365b0b2d.tar.gz/sha512 deleted file mode 100644 index bb5ed6f7ae970..0000000000000 --- a/deps/checksums/Pkg-3c86ba27e904807e13beb8cb0466ed70365b0b2d.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -265e293ee24eac484f45311019c22ada29db413e783fb9e8f3eb4c94925ea79557580839a6b1e6ea655d91c198e6e62043fcfd07da025ce3e03fb2379207aca8 diff --git a/deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/md5 b/deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/md5 new file mode 100644 index 0000000000000..da07a1db40f62 --- /dev/null +++ b/deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/md5 @@ -0,0 +1 @@ +2ba9c89a7a992718ebb61d83413bfdda diff --git a/deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/sha512 b/deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/sha512 new file mode 100644 index 0000000000000..37b2eaed904e3 --- /dev/null +++ b/deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/sha512 @@ -0,0 +1 @@ +315c84090af40a209debdd4f95460bff31c11a5fbd1b3420a575d669a1c1c5edc34573fde12b129f0eb9e533f87ded862c9b58a9ab0b42afd44dbd57606404bb From 3c8caebdb4c4120986dfefd64cc5da3c3022075e Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 29 Jan 2024 23:55:23 -0600 Subject: [PATCH 12/17] bump Pkg --- .../Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/md5 | 1 + .../Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/sha512 | 1 + .../Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/md5 | 1 - .../Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/sha512 | 1 - stdlib/Pkg.version | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/md5 create mode 100644 deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/sha512 delete mode 100644 deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/md5 delete mode 100644 deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/sha512 diff --git a/deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/md5 b/deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/md5 new file mode 100644 index 0000000000000..1f83b0baffcdd --- /dev/null +++ b/deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/md5 @@ -0,0 +1 @@ +c8723c90a09a2368c88c813517cdfed3 diff --git a/deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/sha512 b/deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/sha512 new file mode 100644 index 0000000000000..5a48fb7857799 --- /dev/null +++ b/deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/sha512 @@ -0,0 +1 @@ +d8324970187fbd82bdc7fcb8b151c09e0dcad0f8dcd33c6f4bdab1c6c1c428def6da7ff3320cc0dcfdb332631927b0a6a7e16feb5ef0aae222ac90fa0bace831 diff --git a/deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/md5 b/deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/md5 deleted file mode 100644 index da07a1db40f62..0000000000000 --- a/deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -2ba9c89a7a992718ebb61d83413bfdda diff --git a/deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/sha512 b/deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/sha512 deleted file mode 100644 index 37b2eaed904e3..0000000000000 --- a/deps/checksums/Pkg-74d105303f91ded5b730856cc54aa36bd9972809.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -315c84090af40a209debdd4f95460bff31c11a5fbd1b3420a575d669a1c1c5edc34573fde12b129f0eb9e533f87ded862c9b58a9ab0b42afd44dbd57606404bb diff --git a/stdlib/Pkg.version b/stdlib/Pkg.version index 5dde0a1692045..9b2005ac64bc9 100644 --- a/stdlib/Pkg.version +++ b/stdlib/Pkg.version @@ -1,4 +1,4 @@ PKG_BRANCH = lh/remove-using-same-name -PKG_SHA1 = 74d105303f91ded5b730856cc54aa36bd9972809 +PKG_SHA1 = 18669098c23ccb3e0c9fd52bc3075662c9ad829e PKG_GIT_URL := https://github.com/JuliaLang/Pkg.jl.git PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1 From 32b36034a69e9066679c857f7374c1f2ad10476f Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Tue, 30 Jan 2024 00:04:19 -0600 Subject: [PATCH 13/17] update JuliaSyntax checksums --- .../md5 | 2 +- .../sha512 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/md5 b/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/md5 index 860c73e7c9da1..8f020683aa4b9 100644 --- a/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/md5 +++ b/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/md5 @@ -1 +1 @@ -7dc5532d0857ea08e967fe3dcff84024 +4f01f6c6538d08265522707574fd7c1d diff --git a/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/sha512 b/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/sha512 index 793bcf07679ef..8fd1b19b52bce 100644 --- a/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/sha512 +++ b/deps/checksums/JuliaSyntax-d3cc52a1f8f27d145517484db80e6ff20619aa00.tar.gz/sha512 @@ -1 +1 @@ -67e316fa0e4a410b393cc3a521dc770b8c3501a1b056af83b9206b38d430573117e6bb49ce9a3a05a4868f2c4865caacbe2cd5c9dc53871a9868ad8f51fb0f5f +48db105250b0686e8d0834ba7af45656173d040438357e5569514b22dedd6e0dea742359153f16a07346fe3d34a81f75e7de1beacd9e0bf6ffa81dfa69e72167 From 2882f2701cb98ccd45a25f81e66ac473ca52e25c Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Tue, 30 Jan 2024 09:17:59 -0600 Subject: [PATCH 14/17] some test fixups --- stdlib/InteractiveUtils/test/runtests.jl | 3 +-- stdlib/Libdl/test/runtests.jl | 3 +-- test/backtrace.jl | 2 +- test/core.jl | 2 +- test/filesystem.jl | 2 +- test/ordering.jl | 2 +- test/reflection.jl | 9 ++++--- test/sorting.jl | 2 +- test/syntax.jl | 32 +++--------------------- 9 files changed, 17 insertions(+), 40 deletions(-) diff --git a/stdlib/InteractiveUtils/test/runtests.jl b/stdlib/InteractiveUtils/test/runtests.jl index cb0621516189a..cdf4c710a1642 100644 --- a/stdlib/InteractiveUtils/test/runtests.jl +++ b/stdlib/InteractiveUtils/test/runtests.jl @@ -727,6 +727,5 @@ end @testset "Docstrings" begin undoc = Docs.undocumented_names(InteractiveUtils) - @test_broken isempty(undoc) - @test undoc == [:InteractiveUtils] + @test isempty(undoc) end diff --git a/stdlib/Libdl/test/runtests.jl b/stdlib/Libdl/test/runtests.jl index cbff36c870fe7..b7a2234f3e896 100644 --- a/stdlib/Libdl/test/runtests.jl +++ b/stdlib/Libdl/test/runtests.jl @@ -332,6 +332,5 @@ end; end @testset "Docstrings" begin undoc = Docs.undocumented_names(Libdl) - @test_broken isempty(undoc) - @test undoc == [:Libdl] + @test isempty(undoc) end diff --git a/test/backtrace.jl b/test/backtrace.jl index 50a50100488c4..c917a8b0aa1bd 100644 --- a/test/backtrace.jl +++ b/test/backtrace.jl @@ -228,7 +228,7 @@ let trace = try end @test trace[1].func === Symbol("top-level scope") @test trace[1].file === :a_filename - @test trace[1].line == 3 + @test trace[1].line == 2 end # issue #45171 diff --git a/test/core.jl b/test/core.jl index ba42687acd0d0..210011b103b33 100644 --- a/test/core.jl +++ b/test/core.jl @@ -1181,7 +1181,7 @@ let A = [1] end # Module() constructor -@test names(Module(:anonymous), all = true, imported = true) == [:anonymous] +@test names(Module(:anonymous), all = true, imported = true) == [:Base, :anonymous] @test names(Module(:anonymous, false), all = true, imported = true) == [:anonymous] @test Module(:anonymous, false, true).Core == Core @test_throws UndefVarError Module(:anonymous, false, false).Core diff --git a/test/filesystem.jl b/test/filesystem.jl index c9bab69c586b3..d7f5d229e0f05 100644 --- a/test/filesystem.jl +++ b/test/filesystem.jl @@ -44,5 +44,5 @@ end @testset "Base.Filesystem docstrings" begin undoc = Docs.undocumented_names(Base.Filesystem) @test_broken isempty(undoc) - @test undoc == [:File, :Filesystem, :JL_O_APPEND, :JL_O_ASYNC, :JL_O_CLOEXEC, :JL_O_CREAT, :JL_O_DIRECT, :JL_O_DIRECTORY, :JL_O_DSYNC, :JL_O_EXCL, :JL_O_FSYNC, :JL_O_LARGEFILE, :JL_O_NDELAY, :JL_O_NOATIME, :JL_O_NOCTTY, :JL_O_NOFOLLOW, :JL_O_NONBLOCK, :JL_O_PATH, :JL_O_RANDOM, :JL_O_RDONLY, :JL_O_RDWR, :JL_O_RSYNC, :JL_O_SEQUENTIAL, :JL_O_SHORT_LIVED, :JL_O_SYNC, :JL_O_TEMPORARY, :JL_O_TMPFILE, :JL_O_TRUNC, :JL_O_WRONLY, :S_IRGRP, :S_IROTH, :S_IRUSR, :S_IRWXG, :S_IRWXO, :S_IRWXU, :S_IWGRP, :S_IWOTH, :S_IWUSR, :S_IXGRP, :S_IXOTH, :S_IXUSR, :cptree, :futime, :rename, :sendfile, :unlink] + @test undoc == [:File, :JL_O_APPEND, :JL_O_ASYNC, :JL_O_CLOEXEC, :JL_O_CREAT, :JL_O_DIRECT, :JL_O_DIRECTORY, :JL_O_DSYNC, :JL_O_EXCL, :JL_O_FSYNC, :JL_O_LARGEFILE, :JL_O_NDELAY, :JL_O_NOATIME, :JL_O_NOCTTY, :JL_O_NOFOLLOW, :JL_O_NONBLOCK, :JL_O_PATH, :JL_O_RANDOM, :JL_O_RDONLY, :JL_O_RDWR, :JL_O_RSYNC, :JL_O_SEQUENTIAL, :JL_O_SHORT_LIVED, :JL_O_SYNC, :JL_O_TEMPORARY, :JL_O_TMPFILE, :JL_O_TRUNC, :JL_O_WRONLY, :S_IRGRP, :S_IROTH, :S_IRUSR, :S_IRWXG, :S_IRWXO, :S_IRWXU, :S_IWGRP, :S_IWOTH, :S_IWUSR, :S_IXGRP, :S_IXOTH, :S_IXUSR, :cptree, :futime, :rename, :sendfile, :unlink] end diff --git a/test/ordering.jl b/test/ordering.jl index 3b5385b99be68..3a55ecd89ac41 100644 --- a/test/ordering.jl +++ b/test/ordering.jl @@ -55,5 +55,5 @@ struct SomeOtherOrder <: Base.Order.Ordering end @testset "Base.Order docstrings" begin undoc = Docs.undocumented_names(Base.Order) @test_broken isempty(undoc) - @test undoc == [:DirectOrdering, :ForwardOrdering, :Order, :ordtype] + @test undoc == [:DirectOrdering, :ForwardOrdering, :ordtype] end diff --git a/test/reflection.jl b/test/reflection.jl index c4f2e0832a3ea..b8054c929a50c 100644 --- a/test/reflection.jl +++ b/test/reflection.jl @@ -169,11 +169,11 @@ let @test Base.binding_module(TestMod7648, :d7648) == TestMod7648 @test Base.binding_module(TestMod7648, :a9475) == TestMod7648.TestModSub9475 @test Base.binding_module(TestMod7648.TestModSub9475, :b9475) == TestMod7648.TestModSub9475 - @test Set(names(TestMod7648))==Set([:TestMod7648, :a9475, :foo9475, :c7648, :foo7648, :foo7648_nomethods, :Foo7648]) + @test Set(names(TestMod7648))==Set([:a9475, :foo9475, :c7648, :foo7648, :foo7648_nomethods, :Foo7648]) @test Set(names(TestMod7648, all = true)) == Set([:TestMod7648, :TestModSub9475, :a9475, :foo9475, :c7648, :d7648, :f7648, :foo7648, Symbol("#foo7648"), :foo7648_nomethods, Symbol("#foo7648_nomethods"), :Foo7648, :eval, Symbol("#eval"), :include, Symbol("#include")]) - @test Set(names(TestMod7648, all = true, imported = true)) == Set([:TestMod7648, :TestModSub9475, :a9475, :foo9475, :c7648, :d7648, :f7648, + @test Set(names(TestMod7648, all = true, imported = true)) == Set([:TestModSub9475, :a9475, :foo9475, :c7648, :d7648, :f7648, :foo7648, Symbol("#foo7648"), :foo7648_nomethods, Symbol("#foo7648_nomethods"), :Foo7648, :eval, Symbol("#eval"), :include, Symbol("#include"), :convert, :curmod_name, :curmod]) @@ -1132,7 +1132,7 @@ private() = 1 end -@test names(TestNames) == [:TestNames, :exported, :publicized] +@test names(TestNames) == [:exported, :publicized] # reflections for generated function with abstract input types @@ -1224,4 +1224,7 @@ using Statistics as Stats @test Stats === Stats.Statistics @test_throws UndefVarError Statistics.mean([0]) +# combined "as" and "non-as" +using Base, Statisitics as Stats, Test, .M1.M2 as Mod, M1 + end diff --git a/test/sorting.jl b/test/sorting.jl index d1875c9727a29..68ca33dd129fd 100644 --- a/test/sorting.jl +++ b/test/sorting.jl @@ -12,7 +12,7 @@ using .Main.OffsetArrays @testset "Base.Sort docstrings" begin undoc = Docs.undocumented_names(Base.Sort) @test_broken isempty(undoc) - @test undoc == [:Algorithm, :SMALL_ALGORITHM, :SMALL_THRESHOLD, :Sort] + @test undoc == [:Algorithm, :SMALL_ALGORITHM, :SMALL_THRESHOLD] end @testset "Order" begin diff --git a/test/syntax.jl b/test/syntax.jl index f63bb120dfe83..c95a59da542f0 100644 --- a/test/syntax.jl +++ b/test/syntax.jl @@ -476,7 +476,7 @@ let err = try catch e e end - @test err.line == 7 + @test err.line == 5 end # PR #17393 @@ -924,27 +924,7 @@ end macro err20000() return Expr(:error, "oops!") end - -@test Meta.lower(@__MODULE__, :(@err20000)) == Expr(:error, "oops!") - -# issue #20000 -@test Meta.parse("@m(a; b=c)") == Expr(:macrocall, Symbol("@m"), LineNumberNode(1, :none), - Expr(:parameters, Expr(:kw, :b, :c)), :a) - -# issue #21054 -macro make_f21054(T) - quote - $(esc(:f21054))(X::Type{<:$T}) = 1 - end -end -@eval @make_f21054 $Array -@test isa(f21054, Function) -g21054(>:) = >:2 -@test g21054(-) == -2 - -# issue #21168 -@test Meta.lower(Main, :(a.[1])) == Expr(:error, "invalid syntax \"a.[1]\"") -@test Meta.lower(Main, :(a.{1})) == Expr(:error, "invalid syntax \"a.{1}\"") +Filesystem # Issue #21225 let abstr = Meta.parse("abstract type X end") @@ -1754,7 +1734,7 @@ eval(Expr(:toplevel, Expr(:block, Expr(:export, :Inner), Expr(:abstract, :Inner))))) -@test names(Mod28991) == Symbol[:Inner, :Mod28991] +@test names(Mod28991) == Symbol[:Inner] # issue #28593 macro a28593() @@ -2600,9 +2580,6 @@ end @test B37890(1.0, 2.0f0) isa B37890{Int, Int8} # import ... as -@test_parseerror("using A as B", "invalid syntax \"using A as ...\"") -@test_parseerror("using A.b as B", "invalid syntax \"using A.b as ...\"") -@test_parseerror("using X, A.b as B", "invalid syntax \"using A.b as ...\"") @test_parseerror("import A as B: c", "invalid syntax \"import A as B:\"") @test_parseerror("import A.b as B: c", "invalid syntax \"import A.b as B:\"") @@ -2678,8 +2655,7 @@ import .Mod.@mac as @m @test_throws ErrorException eval(:(using .Mod: func as @notmacro)) @test_throws ErrorException eval(:(using .Mod as @M)) -e = @test_throws ErrorException eval(:(using .Mod.Mod2 as @M)) -@test occursin("Mod2", e.value.msg) +@test_throws UndefVarError eval(:(using .Mod.Mod2 as @M)) import .Mod2.x_from_mod From 8870c82ae7483a999c338f7899c8f81a3c5cc6e3 Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Tue, 30 Jan 2024 15:55:35 +0000 Subject: [PATCH 15/17] Fix typo --- test/reflection.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/reflection.jl b/test/reflection.jl index b8054c929a50c..f1e23894c601b 100644 --- a/test/reflection.jl +++ b/test/reflection.jl @@ -1225,6 +1225,6 @@ using Statistics as Stats @test_throws UndefVarError Statistics.mean([0]) # combined "as" and "non-as" -using Base, Statisitics as Stats, Test, .M1.M2 as Mod, M1 +using Base, Statistics as Stats, Test, .M1.M2 as Mod, M1 end From 7ba45b6f2e1b376ce2b5bc120c4c35e3ce2465f4 Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Fri, 11 Apr 2025 12:09:15 -0500 Subject: [PATCH 16/17] Switch bacl to (old) master Pkg --- stdlib/Pkg.version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/Pkg.version b/stdlib/Pkg.version index 9b2005ac64bc9..8d13ca7f3e8dc 100644 --- a/stdlib/Pkg.version +++ b/stdlib/Pkg.version @@ -1,4 +1,4 @@ -PKG_BRANCH = lh/remove-using-same-name -PKG_SHA1 = 18669098c23ccb3e0c9fd52bc3075662c9ad829e +PKG_BRANCH = master +PKG_SHA1 = 5432fdd30f06707ee227237224b0b72168c2c2f5 PKG_GIT_URL := https://github.com/JuliaLang/Pkg.jl.git PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1 From f435ae1506ded015f81c29300b3961e0505e6d1a Mon Sep 17 00:00:00 2001 From: DilumAluthgeBot <43731525+DilumAluthgeBot@users.noreply.github.com> Date: Fri, 11 Apr 2025 13:41:59 -0400 Subject: [PATCH 17/17] =?UTF-8?q?=F0=9F=A4=96=20[lh/using-as]=20Bump=20the?= =?UTF-8?q?=20Pkg=20stdlib=20from=205432fdd30=20to=204c9b08431=20(#58079)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Stdlib: Pkg URL: https://github.com/JuliaLang/Pkg.jl.git Stdlib branch: master Julia branch: lh/using-as Old commit: 5432fdd30 New commit: 4c9b08431 Julia version: 1.13.0-DEV Pkg version: 1.12.0(Does not match) Bump invoked by: @LilithHafner Powered by: [BumpStdlibs.jl](https://github.com/JuliaLang/BumpStdlibs.jl) Diff: https://github.com/JuliaLang/Pkg.jl/compare/5432fdd30f06707ee227237224b0b72168c2c2f5...4c9b08431bb4d0cf875c517e65b9193906211746 ``` $ git log --oneline 5432fdd30..4c9b08431 4c9b08431 Stop using the `module Mod; using Mod; end` pattern [NFC] (#3750) bde7ce039 also collect packages tracking a repo when "traversing" developed packages (#4198) ``` Co-authored-by: LilithHafner <60898866+LilithHafner@users.noreply.github.com> --- .../Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/md5 | 1 - .../Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/sha512 | 1 - .../Pkg-4c9b08431bb4d0cf875c517e65b9193906211746.tar.gz/md5 | 1 + .../Pkg-4c9b08431bb4d0cf875c517e65b9193906211746.tar.gz/sha512 | 1 + .../Pkg-5432fdd30f06707ee227237224b0b72168c2c2f5.tar.gz/md5 | 1 - .../Pkg-5432fdd30f06707ee227237224b0b72168c2c2f5.tar.gz/sha512 | 1 - stdlib/Pkg.version | 2 +- 7 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/md5 delete mode 100644 deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/sha512 create mode 100644 deps/checksums/Pkg-4c9b08431bb4d0cf875c517e65b9193906211746.tar.gz/md5 create mode 100644 deps/checksums/Pkg-4c9b08431bb4d0cf875c517e65b9193906211746.tar.gz/sha512 delete mode 100644 deps/checksums/Pkg-5432fdd30f06707ee227237224b0b72168c2c2f5.tar.gz/md5 delete mode 100644 deps/checksums/Pkg-5432fdd30f06707ee227237224b0b72168c2c2f5.tar.gz/sha512 diff --git a/deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/md5 b/deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/md5 deleted file mode 100644 index 1f83b0baffcdd..0000000000000 --- a/deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -c8723c90a09a2368c88c813517cdfed3 diff --git a/deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/sha512 b/deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/sha512 deleted file mode 100644 index 5a48fb7857799..0000000000000 --- a/deps/checksums/Pkg-18669098c23ccb3e0c9fd52bc3075662c9ad829e.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -d8324970187fbd82bdc7fcb8b151c09e0dcad0f8dcd33c6f4bdab1c6c1c428def6da7ff3320cc0dcfdb332631927b0a6a7e16feb5ef0aae222ac90fa0bace831 diff --git a/deps/checksums/Pkg-4c9b08431bb4d0cf875c517e65b9193906211746.tar.gz/md5 b/deps/checksums/Pkg-4c9b08431bb4d0cf875c517e65b9193906211746.tar.gz/md5 new file mode 100644 index 0000000000000..dff679f66233b --- /dev/null +++ b/deps/checksums/Pkg-4c9b08431bb4d0cf875c517e65b9193906211746.tar.gz/md5 @@ -0,0 +1 @@ +aeb5efda5cdf4e6e7d7741108d776fe1 diff --git a/deps/checksums/Pkg-4c9b08431bb4d0cf875c517e65b9193906211746.tar.gz/sha512 b/deps/checksums/Pkg-4c9b08431bb4d0cf875c517e65b9193906211746.tar.gz/sha512 new file mode 100644 index 0000000000000..8cea6087e3251 --- /dev/null +++ b/deps/checksums/Pkg-4c9b08431bb4d0cf875c517e65b9193906211746.tar.gz/sha512 @@ -0,0 +1 @@ +8f36b304d5e963c3ee649bafd1b06b26673a24c66be3aa3c8335ed941544140ba10878d00ff7a80aab288d57e69268bf4363e131ee852bebae726609a5b79686 diff --git a/deps/checksums/Pkg-5432fdd30f06707ee227237224b0b72168c2c2f5.tar.gz/md5 b/deps/checksums/Pkg-5432fdd30f06707ee227237224b0b72168c2c2f5.tar.gz/md5 deleted file mode 100644 index bcaf046283425..0000000000000 --- a/deps/checksums/Pkg-5432fdd30f06707ee227237224b0b72168c2c2f5.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -e097e71eea7524a17bda8ba14569a983 diff --git a/deps/checksums/Pkg-5432fdd30f06707ee227237224b0b72168c2c2f5.tar.gz/sha512 b/deps/checksums/Pkg-5432fdd30f06707ee227237224b0b72168c2c2f5.tar.gz/sha512 deleted file mode 100644 index 1c659df733de4..0000000000000 --- a/deps/checksums/Pkg-5432fdd30f06707ee227237224b0b72168c2c2f5.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -56f6baeda00597ab8a9d9827e6a07aa41662e7914c6ba6fe8c6c21c2008a6552db9778ad95dbaad8d0309e6caa25995916adafcd0243b0f26e1e5217ae608a01 diff --git a/stdlib/Pkg.version b/stdlib/Pkg.version index 8d13ca7f3e8dc..326b4f5aabb6a 100644 --- a/stdlib/Pkg.version +++ b/stdlib/Pkg.version @@ -1,4 +1,4 @@ PKG_BRANCH = master -PKG_SHA1 = 5432fdd30f06707ee227237224b0b72168c2c2f5 +PKG_SHA1 = 4c9b08431bb4d0cf875c517e65b9193906211746 PKG_GIT_URL := https://github.com/JuliaLang/Pkg.jl.git PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1