kbuild: use the upstream `alloc` crate

Switch away from our fork of the `alloc` crate. We remove it altogether in the next commit.

Wedson Almeida Filho committed 2 years ago

Commit 11795ae1 parent 03989773 files · +5 −14Browse files

Unified · Split

3 files

rust/Makefile +3 −13
rust/kernel/str.rs +1 −0
scripts/generate_rust_analyzer.py +1 −1

     --cfg no_fp_fmt_parse
 alloc-cfgs = \
-    --cfg no_borrow \
-    --cfg no_fmt \
     --cfg no_global_oom_handling \
-    --cfg no_macros \
     --cfg no_rc \
-    --cfg no_str \
+    --cfg no_sync
-    --cfg no_string \
-    --cfg no_sync \
-    --cfg no_thin
 quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $<
       cmd_rustdoc = \
 # due to things that are "configured out" vs. entirely non-existing ones.
 rustdoc-alloc: private rustc_target_flags = $(alloc-cfgs) \
     -Arustdoc::broken_intra_doc_links
-rustdoc-alloc: $(src)/alloc/lib.rs rustdoc-core rustdoc-compiler_builtins FORCE
+rustdoc-alloc: $(RUST_LIB_SRC)/alloc/src/lib.rs rustdoc-core rustdoc-compiler_builtins FORCE
 	+$(call if_changed,rustdoc)
 rustdoc-kernel: private rustc_target_flags = --extern alloc \
 #   - `cargo` only considers the use case of building the standard library
 #     to use it in a given package. Thus we need to create a dummy package
 #     and pick the generated libraries from there.
-#   - Since we only keep a subset of upstream `alloc` in-tree, we need
-#     to recreate it on the fly by putting our sources on top.
 #   - The usual ways of modifying the dependency graph in `cargo` do not seem
 #     to apply for the `-Zbuild-std` steps, thus we have to mislead it
 #     by modifying the sources in the sysroot.
 	rm -rf $(objtree)/$(obj)/test; \
 	mkdir -p $(objtree)/$(obj)/test; \
 	cp -a $(rustc_sysroot) $(objtree)/$(obj)/test/sysroot; \
-	cp -r $(srctree)/$(src)/alloc/* \
-		$(objtree)/$(obj)/test/sysroot/lib/rustlib/src/rust/library/alloc/src; \
 	echo '\#!/bin/sh' > $(objtree)/$(obj)/test/rustc_sysroot; \
 	echo "$(RUSTC) --sysroot=$(abspath $(objtree)/$(obj)/test/sysroot) \"\$$@\"" \
 		>> $(objtree)/$(obj)/test/rustc_sysroot; \
 $(obj)/alloc.o: private skip_clippy = 1
 $(obj)/alloc.o: private skip_flags = -Dunreachable_pub
 $(obj)/alloc.o: private rustc_target_flags = $(alloc-cfgs)
-$(obj)/alloc.o: $(src)/alloc/lib.rs $(obj)/compiler_builtins.o FORCE
+$(obj)/alloc.o: $(RUST_LIB_SRC)/alloc/src/lib.rs $(obj)/compiler_builtins.o FORCE
 	+$(call if_changed_dep,rustc_library)
 $(obj)/build_error.o: $(src)/build_error.rs $(obj)/compiler_builtins.o FORCE

rust/kernel/str.rs+1−0

@@ -2,6 +2,7 @@ · 1 unmodified line
2		2
3	//! String representations.	3	//! String representations.
4		4
		5	use crate::alloc::vec_ext::VecExt;
5	use alloc::alloc::AllocError;	6	use alloc::alloc::AllocError;
6	use alloc::vec::Vec;	7	use alloc::vec::Vec;
7	use core::fmt::{self, Write};	8	use core::fmt::{self, Write};

scripts/generate_rust_analyzer.py+1−1

@@ -66,7 +66,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs): · 65 unmodified lines
66		66
67	append_crate(	67	append_crate(
68	"alloc",	68	"alloc",
69	srctree / "rust" / "alloc" / "lib.rs",	69	sysroot_src / "alloc" / "src" / "lib.rs",
70	["core", "compiler_builtins"],	70	["core", "compiler_builtins"],
71	cfg=crates_cfgs.get("alloc", []),	71	cfg=crates_cfgs.get("alloc", []),
72	)	72	)