Skip to content

Commit 97a1b6a

Browse files
committed
Update usages of 'OSX' (and other old names) to 'macOS'.
As of last year with version 'Sierra', the Mac operating system is now called 'macOS'.
1 parent f88b24b commit 97a1b6a

File tree

41 files changed

+63
-63
lines changed

Some content is hidden

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

41 files changed

+63
-63
lines changed

RELEASES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5056,7 +5056,7 @@ Version 0.1 (2012-01-20)
50565056

50575057
* Compiler works with the following configurations:
50585058
* Linux: x86 and x86_64 hosts and targets
5059-
* MacOS: x86 and x86_64 hosts and targets
5059+
* macOS: x86 and x86_64 hosts and targets
50605060
* Windows: x86 hosts and targets
50615061

50625062
* Cross compilation / multi-target configuration supported.

src/bootstrap/bin/rustc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ fn main() {
182182
if env::var("RUSTC_RPATH") == Ok("true".to_string()) {
183183
let rpath = if target.contains("apple") {
184184

185-
// Note that we need to take one extra step on OSX to also pass
185+
// Note that we need to take one extra step on macOS to also pass
186186
// `-Wl,-instal_name,@rpath/...` to get things to work right. To
187187
// do that we pass a weird flag to the compiler to get it to do
188188
// so. Note that this is definitely a hack, and we should likely

src/bootstrap/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ pub fn compiletest(build: &Build,
176176
cmd.arg("--docck-python").arg(build.python());
177177

178178
if build.config.build.ends_with("apple-darwin") {
179-
// Force /usr/bin/python on OSX for LLDB tests because we're loading the
179+
// Force /usr/bin/python on macOS for LLDB tests because we're loading the
180180
// LLDB plugin's compiled module which only works with the system python
181181
// (namely not Homebrew-installed python)
182182
cmd.arg("--lldb-python").arg("/usr/bin/python");

src/bootstrap/compile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ pub fn rustc(build: &Build, target: &str, compiler: &Compiler) {
249249
cargo.env("CFG_LLVM_ROOT", s);
250250
}
251251
// Building with a static libstdc++ is only supported on linux right now,
252-
// not for MSVC or OSX
252+
// not for MSVC or macOS
253253
if build.config.llvm_static_stdcpp &&
254254
!target.contains("windows") &&
255255
!target.contains("apple") {

src/bootstrap/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ impl Build {
846846
.filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
847847
.collect::<Vec<_>>();
848848

849-
// If we're compiling on OSX then we add a few unconditional flags
849+
// If we're compiling on macOS then we add a few unconditional flags
850850
// indicating that we want libc++ (more filled out than libstdc++) and
851851
// we want to compile for 10.7. This way we can ensure that
852852
// LLVM/jemalloc/etc are all properly compiled.

src/bootstrap/sanity.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ pub fn check(build: &mut Build) {
151151
}
152152

153153
for target in build.config.target.iter() {
154-
// Can't compile for iOS unless we're on OSX
154+
// Can't compile for iOS unless we're on macOS
155155
if target.contains("apple-ios") &&
156156
!build.config.build.contains("apple-darwin") {
157-
panic!("the iOS target is only supported on OSX");
157+
panic!("the iOS target is only supported on macOS");
158158
}
159159

160160
// Make sure musl-root is valid if specified

src/doc/book/src/testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ And that's reflected in the summary line:
147147
test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured
148148
```
149149

150-
We also get a non-zero status code. We can use `$?` on OS X and Linux:
150+
We also get a non-zero status code. We can use `$?` on macOS and Linux:
151151

152152
```bash
153153
$ echo $?

src/liballoc_jemalloc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub use imp::*;
3030
mod imp {
3131
use libc::{c_int, c_void, size_t};
3232

33-
// Note that the symbols here are prefixed by default on OSX and Windows (we
33+
// Note that the symbols here are prefixed by default on macOS and Windows (we
3434
// don't explicitly request it), and on Android and DragonFly we explicitly
3535
// request it as unprefixing cause segfaults (mismatches in allocators).
3636
extern "C" {

src/librustc/middle/cstore.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ pub enum LinkagePreference {
123123
pub enum NativeLibraryKind {
124124
NativeStatic, // native static library (.a archive)
125125
NativeStaticNobundle, // native static library, which doesn't get bundled into .rlibs
126-
NativeFramework, // OSX-specific
126+
NativeFramework, // macOS-specific
127127
NativeUnknown, // default way to specify a dynamic library
128128
}
129129

src/librustc/session/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
971971
always_encode_mir: bool = (false, parse_bool, [TRACKED],
972972
"encode MIR of all functions into the crate metadata"),
973973
osx_rpath_install_name: bool = (false, parse_bool, [TRACKED],
974-
"pass `-install_name @rpath/...` to the OSX linker"),
974+
"pass `-install_name @rpath/...` to the macOS linker"),
975975
sanitizer: Option<Sanitizer> = (None, parse_sanitizer, [TRACKED],
976976
"Use a sanitizer"),
977977
}

0 commit comments

Comments
 (0)