Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 11 pull requests #56353

Closed
wants to merge 26 commits into from
Closed

Rollup of 11 pull requests #56353

Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6674db4
Reuse the `P` in `InvocationCollector::fold_{,opt_}expr`.
nnethercote Nov 20, 2018
464c9da
serialize: preallocate VecDeque in Decodable::decode
ljedrz Nov 21, 2018
591607d
String: add a FIXME to from_utf16
ljedrz Nov 21, 2018
af9b057
drop glue takes in mutable references, it should reflect that in its …
RalfJung Nov 22, 2018
e1ca4f6
fix codegen-units tests
RalfJung Nov 22, 2018
d9de72f
miri: restrict fn argument punning to Rust ABI
RalfJung Nov 22, 2018
5c99ae6
Fix ICE with feature self_struct_ctor
estebank Nov 25, 2018
8d76f54
Use opt_def_id instead of having special branch
estebank Nov 25, 2018
057e6d3
Add TryFrom<&[T]> for [T; $N] where T: Copy
SimonSapin Nov 25, 2018
769d711
add test for issue #21335
euclio Nov 14, 2018
d4a6e73
Use sort_by_cached_key when key the function is not trivial/free
ljedrz Nov 9, 2018
be89dff
use top level `fs` functions where appropriate
euclio Nov 16, 2018
71f643e
Remove not used option
yui-knk Nov 28, 2018
2a91bba
Rename conversion util; remove duplicate util in librustc_codegen_llvm.
frewsxcv Nov 29, 2018
0124341
Only consider stem when extension is exe.
davidtwco Nov 29, 2018
a22dd48
Rollup merge of #55821 - ljedrz:cached_key_sorts, r=michaelwoerister
pietroalbini Nov 29, 2018
57d184b
Rollup merge of #56014 - euclio:issue-21335, r=nagisa
pietroalbini Nov 29, 2018
bb1e861
Rollup merge of #56131 - ljedrz:assorted, r=RalfJung
pietroalbini Nov 29, 2018
b04418c
Rollup merge of #56165 - RalfJung:drop-glue-type, r=eddyb,nikomatsakis
pietroalbini Nov 29, 2018
593cc39
Rollup merge of #56205 - estebank:ice-ice-baby, r=nikomatsakis
pietroalbini Nov 29, 2018
a29ae04
Rollup merge of #56216 - SimonSapin:array-tryfrom-slice, r=withoutboats
pietroalbini Nov 29, 2018
e320a6c
Rollup merge of #56258 - euclio:fs-read-write, r=Mark-Simulacrum
pietroalbini Nov 29, 2018
e2bec1a
Rollup merge of #56268 - nnethercote:fold_opt_expr-recycle, r=petroch…
pietroalbini Nov 29, 2018
7afff28
Rollup merge of #56339 - yui-knk:remove_mir_stats_flag, r=alexcrichton
pietroalbini Nov 29, 2018
b3246f2
Rollup merge of #56341 - frewsxcv:frewsxcv-util-cstr, r=Mark-Simulacrum
pietroalbini Nov 29, 2018
6c3a010
Rollup merge of #56349 - davidtwco:issue-55396-inference-extension, r…
pietroalbini Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/librustc_codegen_ssa/back/link.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,11 @@ pub fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) {
LinkerFlavor::Lld(_) => "lld",
}), flavor)),
(Some(linker), None) => {
let stem = linker.file_stem().and_then(|stem| stem.to_str()).unwrap_or_else(|| {
let stem = if linker.extension().and_then(|ext| ext.to_str()) == Some("exe") {
linker.file_stem().and_then(|stem| stem.to_str())
} else {
linker.to_str()
}.unwrap_or_else(|| {
sess.fatal("couldn't extract file stem from specified linker");
}).to_owned();

Expand Down