Skip to content

Commit

Permalink
Merge pull request torvalds#587 from ojeda/no-try-reserve
Browse files Browse the repository at this point in the history
rust: kbuild: remove `try_reserve` from allowed features
  • Loading branch information
ojeda authored Dec 3, 2021
2 parents 402f419 + ec634a9 commit 3be16cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/Makefile.build
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ quiet_cmd_rustc_o_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@
cmd_rustc_o_rs = \
RUST_MODFILE=$(modfile) \
$(RUSTC_OR_CLIPPY) $(rust_flags) $(rust_cross_flags) \
-Zallow-features=allocator_api,bench_black_box,concat_idents,global_asm,try_reserve,generic_associated_types \
-Zallow-features=allocator_api,bench_black_box,concat_idents,generic_associated_types,global_asm \
--extern alloc --extern kernel \
--crate-type rlib --out-dir $(obj) -L $(objtree)/rust/ \
--crate-name $(patsubst %.o,%,$(notdir $@)) $<; \
Expand Down

0 comments on commit 3be16cd

Please sign in to comment.