kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

Merge pull request #301 from mahkoh/jorth/edition-2024

Browse source 
all: don't use `gen` identifier
This commit is contained in:
mahkoh 2024-10-20 18:03:06 +02:00 • committed by GitHub
commit c139271e7b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pipewire/pw_con.rs
View file

@ -177,14 +177,14 @@ impl PwCon {
|fmt| { |fmt| {
f(fmt); f(fmt);
if self.ack_registry_generation.get() != self.registry_generation.get() { if self.ack_registry_generation.get() != self.registry_generation.get() {
let gen = self.registry_generation.get(); let generation = self.registry_generation.get();
fmt.write_struct(|f| { fmt.write_struct(|f| {
f.write_id(FOOTER_REGISTRY_GENERATION); f.write_id(FOOTER_REGISTRY_GENERATION);
f.write_struct(|f| { f.write_struct(|f| {
f.write_ulong(gen); f.write_ulong(generation);
}); });
}); });
self.ack_registry_generation.set(gen); self.ack_registry_generation.set(generation);
} }
}, },
); );
@ -415,9 +415,9 @@ impl Incoming {
let s2 = p2.read_struct()?; let s2 = p2.read_struct()?;
if opcode == FOOTER_REGISTRY_GENERATION { if opcode == FOOTER_REGISTRY_GENERATION {
let mut p3 = s2.fields; let mut p3 = s2.fields;
let gen = p3.read_ulong()?; let generation = p3.read_ulong()?;
self.con.registry_generation.set(gen); self.con.registry_generation.set(generation);
log::debug!("registry generation = {}", gen); log::debug!("registry generation = {}", generation);
} else { } else {
log::warn!("Unknown message footer: {}", opcode); log::warn!("Unknown message footer: {}", opcode);
} }

4
src/utils/opaque.rs
View file

@ -19,8 +19,8 @@ pub struct Opaque {
pub fn opaque() -> Opaque { pub fn opaque() -> Opaque {
let mut rng = thread_rng(); let mut rng = thread_rng();
Opaque { Opaque {
lo: rng.gen(), lo: rng.r#gen(),
hi: rng.gen(), hi: rng.r#gen(),
} }
} }