diff options
| author | bors <bors@rust-lang.org> | 2024-08-14 14:13:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-14 14:13:48 +0000 |
| commit | 355a307a874077eff12bd99c6fd3eb6bfda79993 (patch) | |
| tree | 459cf7ef097c14f40256cb7e0bcbceafd74b9f8d /src | |
| parent | 0f442e265c165c0a78633bef98de18517815150c (diff) | |
| parent | 4d8c0b3b5dc6c4476946ab713e1d01a1d40a8bef (diff) | |
| download | rust-355a307a874077eff12bd99c6fd3eb6bfda79993.tar.gz rust-355a307a874077eff12bd99c6fd3eb6bfda79993.zip | |
Auto merge of #129092 - jieyouxu:rollup-z2522nm, r=jieyouxu
Rollup of 6 pull requests Successful merges: - #128570 (Stabilize `asm_const`) - #128828 (`-Znext-solver` caching) - #128954 (Explicitly specify type parameter on FromResidual for Option and ControlFlow.) - #129059 (Record the correct target type when coercing fn items/closures to pointers) - #129071 (Port `run-make/sysroot-crates-are-unstable` to rmake) - #129088 (Make the rendered html doc for rustc better) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/unstable-book/src/language-features/asm-const.md | 11 | ||||
| -rw-r--r-- | src/tools/tidy/src/allowed_run_make_makefiles.txt | 1 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/doc/unstable-book/src/language-features/asm-const.md b/src/doc/unstable-book/src/language-features/asm-const.md deleted file mode 100644 index 670c4df414f..00000000000 --- a/src/doc/unstable-book/src/language-features/asm-const.md +++ /dev/null @@ -1,11 +0,0 @@ -# `asm_const` - -The tracking issue for this feature is: [#93332] - -[#93332]: https://github.com/rust-lang/rust/issues/93332 - ------------------------- - -This feature adds a `const <expr>` operand type to `asm!` and `global_asm!`. -- `<expr>` must be an integer constant expression. -- The value of the expression is formatted as a string and substituted directly into the asm template string. diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index 2d25de46f6e..25fa8c5e1af 100644 --- a/src/tools/tidy/src/allowed_run_make_makefiles.txt +++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt @@ -20,6 +20,5 @@ run-make/reproducible-build/Makefile run-make/rlib-format-packed-bundled-libs/Makefile run-make/split-debuginfo/Makefile run-make/symbol-mangling-hashed/Makefile -run-make/sysroot-crates-are-unstable/Makefile run-make/translation/Makefile run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile |