Skip to content

Commit 08b4f1b

Browse files
committed
Auto merge of #96942 - Dylan-DPC:rollup-p8bcly2, r=Dylan-DPC
Rollup of 4 pull requests Successful merges: - #91518 (Add readable rustdoc display for RISC-V target) - #95281 (Fix inaccurate function name in `rustc_const_eval` docs) - #96898 (logging: add env var to control verbose scope entry/exit logging) - #96936 (:arrow_up: rust-analyzer) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents a85de16 + cf1d52f commit 08b4f1b

File tree

5 files changed

+19
-4
lines changed

5 files changed

+19
-4
lines changed

compiler/rustc_const_eval/src/interpret/operand.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
520520
Ok(OpTy { op, layout: place.layout })
521521
}
522522

523-
// Evaluate a place with the goal of reading from it. This lets us sometimes
524-
// avoid allocations.
523+
/// Evaluate a place with the goal of reading from it. This lets us sometimes
524+
/// avoid allocations.
525525
pub fn eval_place_to_op(
526526
&self,
527527
place: mir::Place<'tcx>,

compiler/rustc_const_eval/src/interpret/place.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ where
625625
}
626626

627627
/// Computes a place. You should only use this if you intend to write into this
628-
/// place; for reading, a more efficient alternative is `eval_place_for_read`.
628+
/// place; for reading, a more efficient alternative is `eval_place_to_op`.
629629
#[instrument(skip(self), level = "debug")]
630630
pub fn eval_place(
631631
&mut self,

compiler/rustc_log/src/lib.rs

+13
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,24 @@ pub fn init_env_logger(env: &str) -> Result<(), Error> {
6767
Err(VarError::NotUnicode(_value)) => return Err(Error::NonUnicodeColorValue),
6868
};
6969

70+
let verbose_entry_exit = match env::var_os(String::from(env) + "_ENTRY_EXIT") {
71+
None => false,
72+
Some(v) => {
73+
if &v == "0" {
74+
false
75+
} else {
76+
true
77+
}
78+
}
79+
};
80+
7081
let layer = tracing_tree::HierarchicalLayer::default()
7182
.with_writer(io::stderr)
7283
.with_indent_lines(true)
7384
.with_ansi(color_logs)
7485
.with_targets(true)
86+
.with_verbose_exit(verbose_entry_exit)
87+
.with_verbose_entry(verbose_entry_exit)
7588
.with_indent_amount(2);
7689
#[cfg(parallel_compiler)]
7790
let layer = layer.with_thread_ids(true).with_thread_names(true);

src/librustdoc/clean/cfg.rs

+2
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,8 @@ impl<'a> fmt::Display for Display<'a> {
517517
"msp430" => "MSP430",
518518
"powerpc" => "PowerPC",
519519
"powerpc64" => "PowerPC-64",
520+
"riscv32" => "RISC-V RV32",
521+
"riscv64" => "RISC-V RV64",
520522
"s390x" => "s390x",
521523
"sparc64" => "SPARC64",
522524
"wasm32" | "wasm64" => "WebAssembly",

src/tools/rust-analyzer

0 commit comments

Comments
 (0)