drop the linenoise library

Closes #5038
rust-lang · Oct 17, 2013 · f766aca · f766aca · bors · Oct 17, 2013
1 parent 7c92435
commit f766aca
Show file tree

Hide file tree

Showing 20 changed files with 3 additions and 2,224 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -7,5 +7,4 @@
 src/etc/pkg/rust-logo.ico binary
 src/rt/msvc/* -whitespace
 src/rt/vg/* -whitespace
-src/rt/linenoise/* -whitespace
 src/rt/jemalloc/**/* -whitespace
diff --git a/configure b/configure
@@ -686,7 +686,7 @@ do
     make_dir $t/rt/libuv/src/ev
     make_dir $t/rt/jemalloc
     for i in                                          \
-      isaac linenoise sync test \
+      isaac sync test \
       arch/i386 arch/x86_64 arch/arm arch/mips  \
       sundown/src sundown/html
     do

diff --git a/mk/platform.mk b/mk/platform.mk
@@ -29,7 +29,7 @@ $(foreach t,$(CFG_TARGET_TRIPLES),$(info cfg: os for $(t) is $(OSTYPE_$(t))))
 # FIXME: no-omit-frame-pointer is just so that task_start_wrapper
 # has a frame pointer and the stack walker can understand it. Turning off
 # frame pointers everywhere is overkill
-CFG_GCCISH_CFLAGS += -fno-omit-frame-pointer -DUSE_UTF8
+CFG_GCCISH_CFLAGS += -fno-omit-frame-pointer
 
 # On Darwin, we need to run dsymutil so the debugging information ends
 # up in the right place.  On other platforms, it automatically gets

diff --git a/mk/rt.mk b/mk/rt.mk
@@ -96,9 +96,7 @@ RUNTIME_CXXS_$(1)_$(2) := \
               rt/rust_android_dummy.cpp \
               rt/rust_test_helpers.cpp
 
-RUNTIME_CS_$(1)_$(2) := rt/linenoise/linenoise.c \
-			rt/linenoise/utf8.c \
-			rt/sundown/src/autolink.c \
+RUNTIME_CS_$(1)_$(2) := rt/sundown/src/autolink.c \
 			rt/sundown/src/buffer.c \
 			rt/sundown/src/stack.c \
 			rt/sundown/src/markdown.c \
@@ -116,7 +114,6 @@ RT_BUILD_DIR_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/stage$(2)
 RUNTIME_DEF_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/rustrt$$(CFG_DEF_SUFFIX_$(1))
 RUNTIME_INCS_$(1)_$(2) := -I $$(S)src/rt -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
                      -I $$(S)src/rt/arch/$$(HOST_$(1)) \
-                     -I $$(S)src/rt/linenoise \
                      -I $$(S)src/rt/sundown/src \
                      -I $$(S)src/rt/sundown/html \
                      -I $$(S)src/libuv/include

diff --git a/mk/tests.mk b/mk/tests.mk
@@ -227,7 +227,6 @@ ALL_CS := $(wildcard $(S)src/rt/*.cpp \
                      $(S)src/rt/*/*/*.cpp \
                      $(S)src/rustllvm/*.cpp)
 ALL_CS := $(filter-out $(S)src/rt/miniz.cpp \
-		       $(wildcard $(S)src/rt/linenoise/*.c) \
 		       $(wildcard $(S)src/rt/sundown/src/*.c) \
 		       $(wildcard $(S)src/rt/sundown/html/*.c) \
 	,$(ALL_CS))
@@ -240,8 +239,6 @@ ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
                        $(S)src/rt/msvc/typeof.h \
                        $(S)src/rt/msvc/stdint.h \
                        $(S)src/rt/msvc/inttypes.h \
-                       $(S)src/rt/linenoise/linenoise.h \
-                       $(S)src/rt/linenoise/utf8.h \
 		       $(wildcard $(S)src/rt/sundown/src/*.h) \
 		       $(wildcard $(S)src/rt/sundown/html/*.h) \
 	,$(ALL_HS))

diff --git a/src/README.txt b/src/README.txt
@@ -17,7 +17,6 @@ rt/sync            - Concurrency utils
 rt/util            - Small utility classes for the runtime.
 rt/vg              - Valgrind headers
 rt/msvc            - MSVC support
-rt/linenoise       - a readline-like line editing library
 
 test/              Testsuite
 test/compile-fail  - Tests that should fail to compile

diff --git a/src/libextra/extra.rs b/src/libextra/extra.rs
@@ -94,7 +94,6 @@ pub mod term;
 pub mod time;
 pub mod arena;
 pub mod base64;
-pub mod rl;
 pub mod workcache;
 pub mod enum_set;
 #[path="num/bigint.rs"]

diff --git a/src/libextra/rl.rs b/src/libextra/rl.rs
diff --git a/src/rt/linenoise/README.markdown b/src/rt/linenoise/README.markdown
diff --git a/src/rt/linenoise/example.c b/src/rt/linenoise/example.c