Merge pull request JuliaLang#25978 from fredrikekre/fe/edit

Fix two annoying warnings
halleysfifthinc · Feb 9, 2018 · f45b9b0 · f45b9b0
2 parents e0c93aa + c08f221
commit f45b9b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/stdlib/Pkg/src/Pkg.jl b/stdlib/Pkg/src/Pkg.jl
@@ -14,7 +14,7 @@ Please see the manual section on packages for more information.
 module Pkg
 
 export Dir, Types, Reqs, Cache, Read, Query, Resolve, Write, Entry
-export dir, init, rm, add, available, installed, status, clone, checkout,
+export dir, init, add, available, installed, status, clone, checkout,
  update, resolve, test, build, free, pin, PkgError, setprotocol!
 
 const DEFAULT_META = "https://github.com/JuliaLang/METADATA.jl"

diff --git a/stdlib/REPL/src/REPL.jl b/stdlib/REPL/src/REPL.jl
@@ -3,6 +3,7 @@
 module REPL
 
 using Base.Meta
+import InteractiveUtils
 
 export
  AbstractREPL,
@@ -981,7 +982,7 @@ function setup_interface(
  if n <= 0 || n > length(linfos) || startswith(linfos[n][1], "./REPL")
  @goto writeback
  end
- Base.edit(linfos[n][1], linfos[n][2])
+ InteractiveUtils.edit(linfos[n][1], linfos[n][2])
  LineEdit.refresh_line(s)
  return
  @label writeback