Skip to content

Commit 7a0c2a4

Browse files
committed
Fix a pair of typos
1 parent 89b9940 commit 7a0c2a4

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
name: 'wasmtime github releases'
2-
description: 'wasmtime github releases'
1+
name: "wasmtime github releases"
2+
description: "wasmtime github releases"
33
inputs:
44
token:
5-
description: ''
5+
description: ""
66
required: true
77
name:
8-
description: ''
8+
description: ""
99
required: true
1010
files:
11-
description: ''
11+
description: ""
1212
required: true
1313
runs:
14-
using: 'docker'
15-
image: 'Dockerfile'
14+
using: "docker"
15+
image: "Dockerfile"

crates/proc-macro-api/src/version.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,15 @@ pub fn read_version(dylib_path: &AbsPath) -> io::Result<String> {
134134
));
135135
}
136136
};
137+
<<<<<<< Updated upstream
137138

139+
||||||| Stash base
140+
}
141+
142+
let snappy_portion = &dot_rustc[8..];
143+
144+
=======
145+
>>>>>>> Stashed changes
138146
let mut snappy_decoder = SnapDecoder::new(snappy_portion);
139147

140148
// the bytes before version string bytes, so this basically is:

crates/stdx/src/rand.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! We don't use `rand`, as that's too many things for us.
22
//!
3-
//! Currently, we use oorandom instead, but it misses these two utilities.
4-
//! Perhaps we should switch to `fastrand`, or our own small prng, it's not like
5-
//! we need anything move complicatied that xor-shift.
3+
//! We currently use oorandom instead, but it's missing these two utilities.
4+
//! Perhaps we should switch to `fastrand`, or our own small PRNG, it's not like
5+
//! we need anything more complicated that xor-shift.
66
77
pub fn shuffle<T>(slice: &mut [T], mut rand_index: impl FnMut(usize) -> usize) {
88
let mut remaining = slice.len() - 1;

0 commit comments

Comments
 (0)