Skip to content

Commit f766aca

Browse files
committed
drop the linenoise library
Closes #5038
1 parent 7c92435 commit f766aca

20 files changed

+3
-2224
lines changed

.gitattributes

-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77
src/etc/pkg/rust-logo.ico binary
88
src/rt/msvc/* -whitespace
99
src/rt/vg/* -whitespace
10-
src/rt/linenoise/* -whitespace
1110
src/rt/jemalloc/**/* -whitespace

configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ do
686686
make_dir $t/rt/libuv/src/ev
687687
make_dir $t/rt/jemalloc
688688
for i in \
689-
isaac linenoise sync test \
689+
isaac sync test \
690690
arch/i386 arch/x86_64 arch/arm arch/mips \
691691
sundown/src sundown/html
692692
do

mk/platform.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ $(foreach t,$(CFG_TARGET_TRIPLES),$(info cfg: os for $(t) is $(OSTYPE_$(t))))
2929
# FIXME: no-omit-frame-pointer is just so that task_start_wrapper
3030
# has a frame pointer and the stack walker can understand it. Turning off
3131
# frame pointers everywhere is overkill
32-
CFG_GCCISH_CFLAGS += -fno-omit-frame-pointer -DUSE_UTF8
32+
CFG_GCCISH_CFLAGS += -fno-omit-frame-pointer
3333

3434
# On Darwin, we need to run dsymutil so the debugging information ends
3535
# up in the right place. On other platforms, it automatically gets

mk/rt.mk

+1-4
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ RUNTIME_CXXS_$(1)_$(2) := \
9696
rt/rust_android_dummy.cpp \
9797
rt/rust_test_helpers.cpp
9898

99-
RUNTIME_CS_$(1)_$(2) := rt/linenoise/linenoise.c \
100-
rt/linenoise/utf8.c \
101-
rt/sundown/src/autolink.c \
99+
RUNTIME_CS_$(1)_$(2) := rt/sundown/src/autolink.c \
102100
rt/sundown/src/buffer.c \
103101
rt/sundown/src/stack.c \
104102
rt/sundown/src/markdown.c \
@@ -116,7 +114,6 @@ RT_BUILD_DIR_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/stage$(2)
116114
RUNTIME_DEF_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/rustrt$$(CFG_DEF_SUFFIX_$(1))
117115
RUNTIME_INCS_$(1)_$(2) := -I $$(S)src/rt -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
118116
-I $$(S)src/rt/arch/$$(HOST_$(1)) \
119-
-I $$(S)src/rt/linenoise \
120117
-I $$(S)src/rt/sundown/src \
121118
-I $$(S)src/rt/sundown/html \
122119
-I $$(S)src/libuv/include

mk/tests.mk

-3
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ ALL_CS := $(wildcard $(S)src/rt/*.cpp \
227227
$(S)src/rt/*/*/*.cpp \
228228
$(S)src/rustllvm/*.cpp)
229229
ALL_CS := $(filter-out $(S)src/rt/miniz.cpp \
230-
$(wildcard $(S)src/rt/linenoise/*.c) \
231230
$(wildcard $(S)src/rt/sundown/src/*.c) \
232231
$(wildcard $(S)src/rt/sundown/html/*.c) \
233232
,$(ALL_CS))
@@ -240,8 +239,6 @@ ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
240239
$(S)src/rt/msvc/typeof.h \
241240
$(S)src/rt/msvc/stdint.h \
242241
$(S)src/rt/msvc/inttypes.h \
243-
$(S)src/rt/linenoise/linenoise.h \
244-
$(S)src/rt/linenoise/utf8.h \
245242
$(wildcard $(S)src/rt/sundown/src/*.h) \
246243
$(wildcard $(S)src/rt/sundown/html/*.h) \
247244
,$(ALL_HS))

src/README.txt

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ rt/sync - Concurrency utils
1717
rt/util - Small utility classes for the runtime.
1818
rt/vg - Valgrind headers
1919
rt/msvc - MSVC support
20-
rt/linenoise - a readline-like line editing library
2120

2221
test/ Testsuite
2322
test/compile-fail - Tests that should fail to compile

src/libextra/extra.rs

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ pub mod term;
9494
pub mod time;
9595
pub mod arena;
9696
pub mod base64;
97-
pub mod rl;
9897
pub mod workcache;
9998
pub mod enum_set;
10099
#[path="num/bigint.rs"]

src/libextra/rl.rs

-143
This file was deleted.

src/rt/linenoise/README.markdown

-47
This file was deleted.

src/rt/linenoise/example.c

-30
This file was deleted.

0 commit comments

Comments
 (0)