History

Merge tag 'rust-6.9' of https://github.com/Rust-for-Linux/linux

Pull Rust updates from Miguel Ojeda: "Another routine one in terms of features. We got two version upgrades this time, but in terms of lines, 'alloc' changes are not very large. Toolchain and infrastructure: - Upgrade to Rust 1.76.0 This time around, due to how the kernel and Rust schedules have aligned, there are two upgrades in fact. These allow us to remove two more unstable features ('const_maybe_uninit_zeroed' and 'ptr_metadata') from the list, among other improvements - Mark 'rustc' (and others) invocations as recursive, which fixes a new warning and prepares us for the future in case we eventually take advantage of the Make jobserver 'kernel' crate: - Add the 'container_of!' macro - Stop using the unstable 'ptr_metadata' feature by employing the now stable 'byte_sub' method to implement 'Arc::from_raw()' - Add the 'time' module with a 'msecs_to_jiffies()' conversion function to begin with, to be used by Rust Binder - Add 'notify_sync()' and 'wait_interruptible_timeout()' methods to 'CondVar', to be used by Rust Binder - Update integer types for 'CondVar' - Rename 'wait_list' field to 'wait_queue_head' in 'CondVar' - Implement 'Display' and 'Debug' for 'BStr' - Add the 'try_from_foreign()' method to the 'ForeignOwnable' trait - Add reexports for macros so that they can be used from the right module (in addition to the root) - A series of code documentation improvements, including adding intra-doc links, consistency improvements, typo fixes... 'macros' crate: - Place generated 'init_module()' function in '.init.text' Documentation: - Add documentation on Rust doctests and how they work" * tag 'rust-6.9' of https://github.com/Rust-for-Linux/linux: (29 commits) rust: upgrade to Rust 1.76.0 kbuild: mark `rustc` (and others) invocations as recursive rust: add `container_of!` macro rust: str: implement `Display` and `Debug` for `BStr` rust: module: place generated init_module() function in .init.text rust: types: add `try_from_foreign()` method docs: rust: Add description of Rust documentation test as KUnit ones docs: rust: Move testing to a separate page rust: kernel: stop using ptr_metadata feature rust: kernel: add reexports for macros rust: locked_by: shorten doclink preview rust: kernel: remove unneeded doclink targets rust: kernel: add doclinks rust: kernel: add blank lines in front of code blocks rust: kernel: mark code fragments in docs with backticks rust: kernel: unify spelling of refcount in docs rust: str: move SAFETY comment in front of unsafe block rust: str: use `NUL` instead of 0 in doc comments rust: kernel: add srctree-relative doclinks rust: ioctl: end top-level module docs with full stop ...

Linus Torvalds committed 2 years ago

Commit 8ede8422 parents 5a2a15c 768409c35 files · +809 −252Browse files

Showing the changes to scripts (3 of 35 files). Show all

Unified · Split

3 files
  1. scripts/Makefile.build +4 −4
  2. scripts/Makefile.host +1 −1
  3. scripts/min-tool-version.sh +1 −1
scripts/Makefile.build+4−4
@@ -290,7 +290,7 @@ quiet_cmd_rustc_o_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@ · 289 unmodified lines
290290 cmd_rustc_o_rs = $(rust_common_cmd) --emit=obj=$@ $<
291291
292292 $(obj)/%.o: $(src)/%.rs FORCE
293− $(call if_changed_dep,rustc_o_rs)
293+ +$(call if_changed_dep,rustc_o_rs)
294294
295295 quiet_cmd_rustc_rsi_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@
296296 cmd_rustc_rsi_rs = \
@@ -298,19 +298,19 @@ quiet_cmd_rustc_rsi_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@ · 1 unmodified line
298298 command -v $(RUSTFMT) >/dev/null && $(RUSTFMT) $@
299299
300300 $(obj)/%.rsi: $(src)/%.rs FORCE
301− $(call if_changed_dep,rustc_rsi_rs)
301+ +$(call if_changed_dep,rustc_rsi_rs)
302302
303303 quiet_cmd_rustc_s_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@
304304 cmd_rustc_s_rs = $(rust_common_cmd) --emit=asm=$@ $<
305305
306306 $(obj)/%.s: $(src)/%.rs FORCE
307− $(call if_changed_dep,rustc_s_rs)
307+ +$(call if_changed_dep,rustc_s_rs)
308308
309309 quiet_cmd_rustc_ll_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@
310310 cmd_rustc_ll_rs = $(rust_common_cmd) --emit=llvm-ir=$@ $<
311311
312312 $(obj)/%.ll: $(src)/%.rs FORCE
313− $(call if_changed_dep,rustc_ll_rs)
313+ +$(call if_changed_dep,rustc_ll_rs)
314314
315315 # Compile assembler sources (.S)
316316 # ---------------------------------------------------------------------------
scripts/Makefile.host+1−1
@@ -156,7 +156,7 @@ quiet_cmd_host-rust = HOSTRUSTC $@ · 155 unmodified lines
156156 cmd_host-rust = \
157157 $(HOSTRUSTC) $(hostrust_flags) --emit=link=$@ $<
158158 $(host-rust): $(obj)/%: $(src)/%.rs FORCE
159− $(call if_changed_dep,host-rust)
159+ +$(call if_changed_dep,host-rust)
160160
161161 targets += $(host-csingle) $(host-cmulti) $(host-cobjs) \
162162 $(host-cxxmulti) $(host-cxxobjs) $(host-rust)
scripts/min-tool-version.sh+1−1
@@ -33,7 +33,7 @@ llvm) · 32 unmodified lines
3333 fi
3434 ;;
3535 rustc)
36− echo 1.74.1
36+ echo 1.76.0
3737 ;;
3838 bindgen)
3939 echo 0.65.1