Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 2ed0f29

Browse files
committedAug 11, 2022
Auto merge of rust-lang#100426 - matthiaskrgr:rollup-0ks4dou, r=matthiaskrgr
Rollup of 13 pull requests Successful merges: - rust-lang#93896 (rustdoc: make item-infos dimmer on dark theme) - rust-lang#99337 (rustdoc: simplify highlight.rs) - rust-lang#99421 (add crt-static for android) - rust-lang#99500 (Fix flags when using clang as linker for Fuchsia) - rust-lang#99511 (make raw_eq precondition more restrictive) - rust-lang#99992 (Add `x.sh` and `x.ps1` shell scripts) - rust-lang#100112 (Fix test: chunks_mut_are_send_and_sync) - rust-lang#100203 (provide correct size hint for unsupported platform `CommandArgs`) - rust-lang#100307 (Fix rust-lang#96847) - rust-lang#100350 (Stringify non-shorthand visibility correctly) - rust-lang#100374 (Improve crate selection on rustdoc search results page) - rust-lang#100392 (Simplify visitors) - rust-lang#100418 (Add stability attributes to BacktraceStatus variants) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 20ffea6 + c7578b4 commit 2ed0f29

File tree

83 files changed

+456
-422
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+456
-422
lines changed
 

‎Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2142,9 +2142,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
21422142

21432143
[[package]]
21442144
name = "libc"
2145-
version = "0.2.126"
2145+
version = "0.2.129"
21462146
source = "registry+https://github.com/rust-lang/crates.io-index"
2147-
checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
2147+
checksum = "64de3cc433455c14174d42e554d4027ee631c4d046d43e3ecc6efc4636cdc7a7"
21482148
dependencies = [
21492149
"rustc-std-workspace-core",
21502150
]

‎compiler/rustc_ast/src/ast.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2601,7 +2601,7 @@ pub struct Visibility {
26012601
#[derive(Clone, Encodable, Decodable, Debug)]
26022602
pub enum VisibilityKind {
26032603
Public,
2604-
Restricted { path: P<Path>, id: NodeId },
2604+
Restricted { path: P<Path>, id: NodeId, shorthand: bool },
26052605
Inherited,
26062606
}
26072607

0 commit comments

Comments
 (0)