diff options
| author | bors <bors@rust-lang.org> | 2022-05-11 13:47:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-11 13:47:38 +0000 |
| commit | 08b4f1be33607fc4f18ce19cfd475ac9f43213fc (patch) | |
| tree | 7b063605700341d78ea936146f2cf47c3081e950 /src | |
| parent | a85de162a513d1d11d263783a3f7092fff824b48 (diff) | |
| parent | cf1d52f9cceda0e0adc79088d4de186f63e6c81a (diff) | |
| download | rust-08b4f1be33607fc4f18ce19cfd475ac9f43213fc.tar.gz rust-08b4f1be33607fc4f18ce19cfd475ac9f43213fc.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/clean/cfg.rs | 2 | ||||
| m--------- | src/tools/rust-analyzer | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/librustdoc/clean/cfg.rs b/src/librustdoc/clean/cfg.rs index 0d213a5a2de..9e9c4dfb506 100644 --- a/src/librustdoc/clean/cfg.rs +++ b/src/librustdoc/clean/cfg.rs @@ -517,6 +517,8 @@ impl<'a> fmt::Display for Display<'a> { "msp430" => "MSP430", "powerpc" => "PowerPC", "powerpc64" => "PowerPC-64", + "riscv32" => "RISC-V RV32", + "riscv64" => "RISC-V RV64", "s390x" => "s390x", "sparc64" => "SPARC64", "wasm32" | "wasm64" => "WebAssembly", diff --git a/src/tools/rust-analyzer b/src/tools/rust-analyzer -Subproject 5dce1ff0212e467271c9e895478670c74d847ee +Subproject 5d5bbec9b60010dd7389a084c56693baf6bda78 |