Skip to content

Commit 9899913

Browse files
committed
Auto merge of #3496 - Takashiidobe:fix-typos, r=JohnTitor
fix typos in libc Fixing some typos: For the change in `src/unix/bsd/apple/mod.rs`, I don't think changing the name of a param changes ABI so I think it's safe to change, but could be wrong. I believe the correct spelling is here: https://opensource.apple.com/source/Libc/Libc-498/darwin/libproc.c.auto.html which indicates it should be `minor`.
2 parents 0292b4e + 346b738 commit 9899913

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

libc-test/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3281,7 +3281,7 @@ fn test_linux(target: &str) {
32813281

32823282
let mut cfg = ctest_cfg();
32833283
cfg.define("_GNU_SOURCE", None);
3284-
// This macro re-deifnes fscanf,scanf,sscanf to link to the symbols that are
3284+
// This macro re-defines fscanf,scanf,sscanf to link to the symbols that are
32853285
// deprecated since glibc >= 2.29. This allows Rust binaries to link against
32863286
// glibc versions older than 2.29.
32873287
cfg.define("__GLIBC_USE_DEPRECATED_SCANF", None);
@@ -3849,7 +3849,7 @@ fn test_linux(target: &str) {
38493849
"PR_SET_VMA" | "PR_SET_VMA_ANON_NAME" => true,
38503850

38513851
// present in recent kernels only
3852-
"PR_SCHED_CORE" | "PR_SCHED_CORE_CREATE" | "PR_SCHED_CORE_GET" | "PR_SCHED_CORE_MAX" | "PR_SCHED_CORE_SCOPE_PROCESS_GROUP" | "PR_SCHED_CORE_SCOPE_THREAD" | "PR_SCHED_CORE_SCOPE_THREAD_GROUP" | "PR_SCHED_CORE_SHARE_FROM" | "PR_SCHED_CORE_SHARE_TO" => true,
3852+
"PR_SCHED_CORE" | "PR_SCHED_CORE_CREATE" | "PR_SCHED_CORE_GET" | "PR_SCHED_CORE_MAX" | "PR_SCHED_CORE_SCOPE_PROCESS_GROUP" | "PR_SCHED_CORE_SCOPE_THREAD" | "PR_SCHED_CORE_SCOPE_THREAD_GROUP" | "PR_SCHED_CORE_SHARE_FROM" | "PR_SCHED_CORE_SHARE_TO" => true,
38533853

38543854
// present in recent kernels only >= 5.13
38553855
"PR_PAC_SET_ENABLED_KEYS" | "PR_PAC_GET_ENABLED_KEYS" => true,

src/unix/bsd/apple/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6239,7 +6239,7 @@ extern "C" {
62396239
buffersize: u32,
62406240
) -> ::c_int;
62416241
pub fn proc_kmsgbuf(buffer: *mut ::c_void, buffersize: u32) -> ::c_int;
6242-
pub fn proc_libversion(major: *mut ::c_int, mintor: *mut ::c_int) -> ::c_int;
6242+
pub fn proc_libversion(major: *mut ::c_int, minor: *mut ::c_int) -> ::c_int;
62436243
pub fn proc_pid_rusage(pid: ::c_int, flavor: ::c_int, buffer: *mut rusage_info_t) -> ::c_int;
62446244

62456245
// Available from Big Sur

src/unix/linux_like/linux/uclibc/x86_64/l4re.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ s! {
1313
/// Combination of granularity and offset.
1414
///
1515
/// The granularity defines how many CPUs each bit in map describes.
16-
/// The offset is the numer of the first CPU described by the first
16+
/// The offset is the number of the first CPU described by the first
1717
/// bit in the bitmap.
1818
/// offset must be a multiple of 2^graularity.
1919
///

0 commit comments

Comments
 (0)