diff options
| author | bors <bors@rust-lang.org> | 2023-11-24 09:21:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-24 09:21:23 +0000 |
| commit | f74f700952f105536446e415b8df8061bddfb25e (patch) | |
| tree | 273518c7ba950fad1e919d966b93132b8dff64ae /src | |
| parent | 8abf920985368264ed4d46e62e1730232e161292 (diff) | |
| parent | 98bae8195d7ca3d18a0e1cadd942b7e159ab4013 (diff) | |
| download | rust-f74f700952f105536446e415b8df8061bddfb25e.tar.gz rust-f74f700952f105536446e415b8df8061bddfb25e.zip | |
Auto merge of #118232 - matthiaskrgr:rollup-x8crvm0, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #116807 (Improve rewind documentation) - #117656 (Update windows-bindgen and define `INVALID_HANDLE_VALUE` ourselves) - #117940 (chore: remove unnecessary drop) - #118028 (Document behavior of `<dyn Any as Any>::type_id()`) - #118060 (Use an absolute path to the NUL device) - #118224 (Sort unstable items last in rustdoc, instead of first) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/render/print_item.rs | 4 | ||||
| -rw-r--r-- | src/tools/generate-windows-sys/Cargo.toml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustdoc/html/render/print_item.rs b/src/librustdoc/html/render/print_item.rs index 927bec4251e..ce9e1bcf488 100644 --- a/src/librustdoc/html/render/print_item.rs +++ b/src/librustdoc/html/render/print_item.rs @@ -369,8 +369,8 @@ fn item_module(w: &mut Buffer, cx: &mut Context<'_>, item: &clean::Item, items: if let (Some(a), Some(b)) = (s1, s2) { match (a.is_stable(), b.is_stable()) { (true, true) | (false, false) => {} - (false, true) => return Ordering::Less, - (true, false) => return Ordering::Greater, + (false, true) => return Ordering::Greater, + (true, false) => return Ordering::Less, } } let lhs = i1.name.unwrap_or(kw::Empty); diff --git a/src/tools/generate-windows-sys/Cargo.toml b/src/tools/generate-windows-sys/Cargo.toml index 9821677a122..d8a7a06efc6 100644 --- a/src/tools/generate-windows-sys/Cargo.toml +++ b/src/tools/generate-windows-sys/Cargo.toml @@ -4,4 +4,4 @@ version = "0.1.0" edition = "2021" [dependencies.windows-bindgen] -version = "0.51.1" +version = "0.52.0" |