diff options
| author | bors <bors@rust-lang.org> | 2024-12-04 07:24:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-04 07:24:25 +0000 |
| commit | 733616f7236b4be140ce851a30b3bb06532b9364 (patch) | |
| tree | 75e3ac8b83b1ed66a9c400ed389652925f6d7e8c /src/librustdoc/json/mod.rs | |
| parent | 2633e019298f8d9f671c8f3d0d3348ce6fa1b8aa (diff) | |
| parent | 0585134e709de4a14e509158662fa569c155c195 (diff) | |
| download | rust-733616f7236b4be140ce851a30b3bb06532b9364.tar.gz rust-733616f7236b4be140ce851a30b3bb06532b9364.zip | |
Auto merge of #133841 - matthiaskrgr:rollup-2snj3hc, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #133651 (Update `NonZero` and `NonNull` to not field-project (per MCP#807)) - #133764 (rustdoc: Rename `set_back_info` to `restore_module_data`.) - #133784 (Fix MutVisitor's default implementations to visit Stmt's and BinOp's spans) - #133798 (stop replacing bivariant args with `'static` when computing closure requirements) - #133804 (Improve code for FileName retrieval in rustdoc) - #133817 (Use `eprintln` instead of `println` in bootstrap/compiletest/tidy) Failed merges: - #133810 (remove unnecessary `eval_verify_bound`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc/json/mod.rs')
| -rw-r--r-- | src/librustdoc/json/mod.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/librustdoc/json/mod.rs b/src/librustdoc/json/mod.rs index 9efcf6b4983..789a5614967 100644 --- a/src/librustdoc/json/mod.rs +++ b/src/librustdoc/json/mod.rs @@ -163,11 +163,10 @@ impl<'tcx> FormatRenderer<'tcx> for JsonRenderer<'tcx> { } fn save_module_data(&mut self) -> Self::ModuleData { - unreachable!("RUN_ON_MODULE = false should never call save_module_data") + unreachable!("RUN_ON_MODULE = false, should never call save_module_data") } - - fn set_back_info(&mut self, _info: Self::ModuleData) { - unreachable!("RUN_ON_MODULE = false should never call set_back_info") + fn restore_module_data(&mut self, _info: Self::ModuleData) { + unreachable!("RUN_ON_MODULE = false, should never call set_back_info") } /// Inserts an item into the index. This should be used rather than directly calling insert on @@ -248,7 +247,7 @@ impl<'tcx> FormatRenderer<'tcx> for JsonRenderer<'tcx> { } fn mod_item_in(&mut self, _item: &clean::Item) -> Result<(), Error> { - unreachable!("RUN_ON_MODULE = false should never call mod_item_in") + unreachable!("RUN_ON_MODULE = false, should never call mod_item_in") } fn after_krate(&mut self) -> Result<(), Error> { |
