Skip to content

Commit 93fa96c

Browse files
committed
Use struct update syntax for some TargetOptions
1 parent 670ff84 commit 93fa96c

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
use crate::spec::{LinkSelfContainedDefault, TargetOptions, base, crt_objects};
22

33
pub(crate) fn opts() -> TargetOptions {
4-
let mut base = base::linux::opts();
5-
6-
base.env = "musl".into();
7-
base.pre_link_objects_self_contained = crt_objects::pre_musl_self_contained();
8-
base.post_link_objects_self_contained = crt_objects::post_musl_self_contained();
9-
base.link_self_contained = LinkSelfContainedDefault::InferredForMusl;
10-
11-
base
4+
TargetOptions {
5+
env: "musl".into(),
6+
pre_link_objects_self_contained: crt_objects::pre_musl_self_contained(),
7+
post_link_objects_self_contained: crt_objects::post_musl_self_contained(),
8+
link_self_contained: LinkSelfContainedDefault::InferredForMusl,
9+
..base::linux::opts()
10+
}
1211
}
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
use crate::spec::{TargetOptions, TlsModel, base};
22

33
pub(crate) fn opts() -> TargetOptions {
4-
let mut base = base::linux::opts();
5-
6-
base.env = "ohos".into();
7-
base.crt_static_default = false;
8-
base.tls_model = TlsModel::Emulated;
9-
base.has_thread_local = false;
10-
11-
base
4+
TargetOptions {
5+
env: "ohos".into(),
6+
crt_static_default: false,
7+
tls_model: TlsModel::Emulated,
8+
has_thread_local: false,
9+
..base::linux::opts()
10+
}
1211
}

0 commit comments

Comments
 (0)