about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-04-23 00:05:31 +0000
committerbors <bors@rust-lang.org>2024-04-23 00:05:31 +0000
commit9cf10bcf5b368de79abc24fc4d50a9d85b377ffa (patch)
tree975fed41d85532188712e2944555a73106f0f538 /src
parent25087e02b34775520856b6cc15e50f5ed0c35f50 (diff)
parent000d0f9116c24c0e24a30e18bfd84f913b099520 (diff)
Auto merge of #124271 - GuillaumeGomez:rollup-7st9wd7, r=GuillaumeGomez
Rollup of 7 pull requests

Successful merges:

 - #115913 (checked_ilog: improve performance)
 - #124178 ([cleanup] [llvm backend] Prevent creating the same `Instance::mono` multiple times)
 - #124183 (Stop taking `ParamTy`/`ParamConst`/`EarlyParamRegion`/`AliasTy` by ref)
 - #124217 (coverage: Prepare for improved branch coverage)
 - #124230 (Stabilize generic `NonZero`.)
 - #124252 (Improve ICE message for forbidden dep-graph reads.)
 - #124268 (Update books)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src')
m---------src/doc/book0
m---------src/doc/edition-guide0
m---------src/doc/reference0
m---------src/doc/rustc-dev-guide0
-rw-r--r--src/tools/miri/src/bin/miri.rs1
-rw-r--r--src/tools/miri/src/lib.rs1
6 files changed, 0 insertions, 2 deletions
diff --git a/src/doc/book b/src/doc/book
-Subproject 3131aa4642c627a24f523c82566b94a7d920f68
+Subproject d207d894cc5e1d496ab99beeacd1a420e5d4d23
diff --git a/src/doc/edition-guide b/src/doc/edition-guide
-Subproject eb3eb80e106d03250c1fb7c5666b1c8c5967286
+Subproject 0c68e90acaae5a611f8f5098a3c2980de9845ab
diff --git a/src/doc/reference b/src/doc/reference
-Subproject 55694913b1301cc809f9bf4a1ad1b3d6920efbd
+Subproject 5854fcc286557ad3ab34d325073d11d8118096b
diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide
-Subproject b77a34bd46399687b4ce6a17198e9f316c98879
+Subproject 07425fed36b00e60341c5e29e28d37d40cbd445
diff --git a/src/tools/miri/src/bin/miri.rs b/src/tools/miri/src/bin/miri.rs
index db2cd01ce0b..0070d1f3ebc 100644
--- a/src/tools/miri/src/bin/miri.rs
+++ b/src/tools/miri/src/bin/miri.rs
@@ -1,4 +1,3 @@
-#![feature(generic_nonzero)]
 #![feature(rustc_private, stmt_expr_attributes)]
 #![allow(
     clippy::manual_range_contains,
diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs
index 2e19c9ff713..e1c0da9118d 100644
--- a/src/tools/miri/src/lib.rs
+++ b/src/tools/miri/src/lib.rs
@@ -2,7 +2,6 @@
 #![feature(cell_update)]
 #![feature(const_option)]
 #![feature(float_gamma)]
-#![feature(generic_nonzero)]
 #![feature(map_try_insert)]
 #![feature(never_type)]
 #![feature(try_blocks)]