diff options
| author | 12101111 <w12101111@gmail.com> | 2020-03-03 16:29:44 +0800 |
|---|---|---|
| committer | 12101111 <w12101111@gmail.com> | 2020-03-03 16:29:44 +0800 |
| commit | 7996df992fba0b7e09215843fcfabc0c53828c57 (patch) | |
| tree | d02300ff8f1a841b0784fa197f0a8d1ae1ea60f8 | |
| parent | 7ca1b2f504a77fd6d82c981242c577dae05f0b9e (diff) | |
| download | rust-7996df992fba0b7e09215843fcfabc0c53828c57.tar.gz rust-7996df992fba0b7e09215843fcfabc0c53828c57.zip | |
Run format.
| -rw-r--r-- | src/librustc_codegen_ssa/back/link.rs | 3 | ||||
| -rw-r--r-- | src/librustc_codegen_utils/link.rs | 4 | ||||
| -rw-r--r-- | src/librustc_metadata/dependency_format.rs | 4 | ||||
| -rw-r--r-- | src/librustc_session/session.rs | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs index 387312addfa..b6cf3a30211 100644 --- a/src/librustc_codegen_ssa/back/link.rs +++ b/src/librustc_codegen_ssa/back/link.rs @@ -1288,7 +1288,8 @@ fn link_args<'a, B: ArchiveBuilder<'a>>( let more_args = &sess.opts.cg.link_arg; let mut args = args.iter().chain(more_args.iter()).chain(used_link_args.iter()); - if is_pic(sess) && !sess.crt_static(Some(crate_type)) && !args.any(|x| *x == "-static") { + if is_pic(sess) && !sess.crt_static(Some(crate_type)) && !args.any(|x| *x == "-static") + { position_independent_executable = true; } } diff --git a/src/librustc_codegen_utils/link.rs b/src/librustc_codegen_utils/link.rs index f80c19a79e2..2850a29148e 100644 --- a/src/librustc_codegen_utils/link.rs +++ b/src/librustc_codegen_utils/link.rs @@ -167,7 +167,9 @@ pub fn invalid_output_for_target(sess: &Session, crate_type: config::CrateType) if !sess.target.target.options.dynamic_linking { return true; } - if sess.crt_static(Some(crate_type)) && !sess.target.target.options.crt_static_allows_dylibs { + if sess.crt_static(Some(crate_type)) + && !sess.target.target.options.crt_static_allows_dylibs + { return true; } } diff --git a/src/librustc_metadata/dependency_format.rs b/src/librustc_metadata/dependency_format.rs index 13cda397f24..4a9a9ddc4bd 100644 --- a/src/librustc_metadata/dependency_format.rs +++ b/src/librustc_metadata/dependency_format.rs @@ -97,7 +97,9 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: config::CrateType) -> DependencyList { // If the global prefer_dynamic switch is turned off, or the final // executable will be statically linked, prefer static crate linkage. - config::CrateType::Executable if !sess.opts.cg.prefer_dynamic || sess.crt_static(Some(ty)) => { + config::CrateType::Executable + if !sess.opts.cg.prefer_dynamic || sess.crt_static(Some(ty)) => + { Linkage::Static } config::CrateType::Executable => Linkage::Dynamic, diff --git a/src/librustc_session/session.rs b/src/librustc_session/session.rs index dcd9ae44e88..619fbdcf7f8 100644 --- a/src/librustc_session/session.rs +++ b/src/librustc_session/session.rs @@ -564,7 +564,7 @@ impl Session { Some(config::CrateType::ProcMacro) => found_positive, Some(_) => !found_negative, None => { - // FIXME: When crate_type is not available, + // FIXME: When crate_type is not available, // we use compiler options to determine the crate_type. // We can't check `#![crate_type = "proc-macro"]` here. if self.opts.crate_types.contains(&config::CrateType::ProcMacro) { |