Rollup merge of rust-lang#136052 - no1wudi:fix, r=workingjubilee

matthiaskrgr · web-flow · commit 678ff2a59b11 · 2025-02-14T16:23:29.000+01:00
Correct comment for FreeBSD and DragonFly BSD in unix/thread
diff --git a/library/std/src/sys/pal/unix/thread.rs b/library/std/src/sys/pal/unix/thread.rs
@@ -144,7 +144,7 @@ impl Thread {
                     const TASK_COMM_LEN: usize = 16;
                     let name = truncate_cstr::<{ TASK_COMM_LEN }>(name);
                 } else {
-                    // FreeBSD, DragonFly, FreeBSD and NuttX do not enforce length limits.
+                    // FreeBSD, DragonFly BSD and NuttX do not enforce length limits.
                 }
             };
             // Available since glibc 2.12, musl 1.1.16, and uClibc 1.0.20 for Linux,

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ impl Thread {`
`144`	`144`	`const TASK_COMM_LEN: usize = 16;`
`145`	`145`	`let name = truncate_cstr::<{ TASK_COMM_LEN }>(name);`
`146`	`146`	`} else {`
`147`		`- // FreeBSD, DragonFly, FreeBSD and NuttX do not enforce length limits.`
	`147`	`+ // FreeBSD, DragonFly BSD and NuttX do not enforce length limits.`
`148`	`148`	`}`
`149`	`149`	`};`
`150`	`150`	`// Available since glibc 2.12, musl 1.1.16, and uClibc 1.0.20 for Linux,`