diff options
| author | bors <bors@rust-lang.org> | 2022-11-24 00:17:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-24 00:17:35 +0000 |
| commit | 872631d0f0fadffe3220ab1bd9c8f1f2342341e2 (patch) | |
| tree | 6721d534b4d7f5b0e7c364c451ffb6b792bfdea7 /compiler/rustc_codegen_cranelift | |
| parent | 70f8737b2f5d3bf7d6b784fad00b663b7ff9feda (diff) | |
| parent | 94470f4efd2ec0786dd1f201e9ea84651b4bb0d0 (diff) | |
| download | rust-872631d0f0fadffe3220ab1bd9c8f1f2342341e2.tar.gz rust-872631d0f0fadffe3220ab1bd9c8f1f2342341e2.zip | |
Auto merge of #104507 - WaffleLapkin:asderefsyou, r=wesleywiser
Use `as_deref` in compiler (but only where it makes sense) This simplifies some code :3 (there are some changes that are not exacly `as_deref`, but more like "clever `Option`/`Result` method use")
Diffstat (limited to 'compiler/rustc_codegen_cranelift')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/build_system/utils.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/config.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_cranelift/build_system/utils.rs b/compiler/rustc_codegen_cranelift/build_system/utils.rs index 48da64906e2..c627af4e62f 100644 --- a/compiler/rustc_codegen_cranelift/build_system/utils.rs +++ b/compiler/rustc_codegen_cranelift/build_system/utils.rs @@ -104,5 +104,5 @@ pub(crate) fn copy_dir_recursively(from: &Path, to: &Path) { } pub(crate) fn is_ci() -> bool { - env::var("CI").as_ref().map(|val| &**val) == Ok("true") + env::var("CI").as_deref() == Ok("true") } diff --git a/compiler/rustc_codegen_cranelift/src/config.rs b/compiler/rustc_codegen_cranelift/src/config.rs index e59a0cb0a23..45522fb1a4c 100644 --- a/compiler/rustc_codegen_cranelift/src/config.rs +++ b/compiler/rustc_codegen_cranelift/src/config.rs @@ -2,7 +2,7 @@ use std::env; use std::str::FromStr; fn bool_env_var(key: &str) -> bool { - env::var(key).as_ref().map(|val| &**val) == Ok("1") + env::var(key).as_deref() == Ok("1") } /// The mode to use for compilation. |