Move fish-rust to project root

CONTRIBUTING.rst

@@ -266,7 +266,7 @@ regressions in the future (i.e., we don’t reintroduce the bug).
 
 The tests can be found in three places:
 
-- fish-rust/src/tests for unit tests.
+- src/tests for unit tests.
 - tests/checks for script tests, run by `littlecheck <https://github.com/ridiculousfish/littlecheck>`__
 - tests/pexpects for interactive tests using `pexpect <https://pexpect.readthedocs.io/en/stable/>`__
 

Cargo.toml

@@ -1,15 +1,13 @@
 [workspace]
 resolver = "2"
 members = [
-    "fish-rust/widestring-suffix",
+    "widestring-suffix",
 ]
 
 [workspace.package]
 rust-version = "1.67"
 edition = "2021"
 
-# TODO: Move fish-rust to src, make it the root package of this workspace
-
 [profile.release]
 overflow-checks = true
 
@@ -18,10 +16,9 @@ name = "fish"
 version = "0.1.0"
 edition.workspace = true
 rust-version.workspace = true
-build = "fish-rust/build.rs"
 
 [dependencies]
-widestring-suffix = { path = "fish-rust/widestring-suffix/" }
+widestring-suffix = { path = "widestring-suffix/" }
 pcre2 = { git = "https://github.com/fish-shell/rust-pcre2", branch = "master", default-features = false, features = ["utf32"] }
 fast-float = { git = "https://github.com/fish-shell/fast-float-rust", branch="fish" }
 hexponent = { git = "https://github.com/fish-shell/hexponent", branch="fish" }
@@ -51,19 +48,19 @@ rsconf = "0.1.1"
 
 [lib]
 crate-type = ["rlib"]
-path = "fish-rust/src/lib.rs"
+path = "src/lib.rs"
 
 [[bin]]
 name = "fish"
-path = "fish-rust/src/bin/fish.rs"
+path = "src/bin/fish.rs"
 
 [[bin]]
 name = "fish_indent"
-path = "fish-rust/src/bin/fish_indent.rs"
+path = "src/bin/fish_indent.rs"
 
 [[bin]]
 name = "fish_key_reader"
-path = "fish-rust/src/bin/fish_key_reader.rs"
+path = "src/bin/fish_key_reader.rs"
 
 [features]
 default = []

build.rs

@@ -51,20 +51,20 @@ fn main() {
     rsconf::link_libraries(&curses_libnames, LinkType::Default);
 
     cc::Build::new()
-        .file("fish-rust/src/libc.c")
+        .file("src/libc.c")
         .include(&build_dir)
         .compile("flibc.a");
 
-    if compiles("fish-rust/src/cfg/w_exitcode.cpp") {
+    if compiles("src/cfg/w_exitcode.cpp") {
         println!("cargo:rustc-cfg=HAVE_WAITSTATUS_SIGNAL_RET");
     }
-    if compiles("fish-rust/src/cfg/eventfd.c") {
+    if compiles("src/cfg/eventfd.c") {
         println!("cargo:rustc-cfg=HAVE_EVENTFD");
     }
-    if compiles("fish-rust/src/cfg/pipe2.c") {
+    if compiles("src/cfg/pipe2.c") {
         println!("cargo:rustc-cfg=HAVE_PIPE2");
     }
-    if compiles("fish-rust/src/cfg/spawn.c") {
+    if compiles("src/cfg/spawn.c") {
         println!("cargo:rustc-cfg=FISH_USE_POSIX_SPAWN");
     }
 

debian/copyright

@@ -25,7 +25,7 @@ Files: share/tools/web_config/themes/Dracula.theme
 Copyright: 2018 Dracula Team
 License: MIT
 
-Files: fish-rust/src/builtins/printf.rs
+Files: src/builtins/printf.rs
 Copyright: 1990-2007 Free Software Foundation, Inc.
            2022 fish-shell contributors
 License: GPL-2+