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.

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 #79440

Closed
wants to merge 30 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4379a43
Suggest turbofish for uninferred const argument
Stupremee Oct 8, 2020
b11d0f2
Update error to reflect that integer literals can have float suffixes
camelid Nov 22, 2020
6e17ab5
Lower `if let` before the arms.
cjgillot Nov 15, 2020
27c60ba
Remove Pat pre-lowering.
cjgillot Nov 15, 2020
1d8c381
Upgrades the coverage map to Version 4
richkadel Nov 23, 2020
5d5dc4c
Updated links to LLVM 11 docs and types
richkadel Nov 24, 2020
51268d2
Check for LLVM 11+ when using `-Z instrument-coverage`
richkadel Nov 24, 2020
5481c1b
Move lev_distance to rustc_ast, make non-generic
sivadeilra Nov 12, 2020
b5fef37
Apply suggestions from code review
richkadel Nov 25, 2020
d61ea56
Clean up rustdoc tests by removing unnecessary features
GuillaumeGomez Nov 25, 2020
1d587d8
Fix persisted doctests on Windows / when using workspaces
Swatinem Nov 25, 2020
b4668ec
Improved version check
richkadel Nov 25, 2020
f4d99d3
fixes a word typo in librustdoc
njasm Nov 25, 2020
29e8e72
Fix typos
bugadani Nov 25, 2020
b1df6c0
replace assert with condition and `fatal` error
richkadel Nov 25, 2020
d334f58
Update compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs
richkadel Nov 25, 2020
46a750e
Fixup compiler docs
camelid Nov 25, 2020
c5c70d4
Fix docs formatting for `thir::pattern::_match`
camelid Nov 25, 2020
fdbc121
fix URLs in doc comment
richkadel Nov 25, 2020
5c68dd9
Rollup merge of #77758 - Stupremee:turbofish-help-for-const, r=varkor
jonas-schievink Nov 26, 2020
c19408c
Rollup merge of #79000 - sivadeilra:user/ardavis/lev_distance, r=wesl…
jonas-schievink Nov 26, 2020
90639fd
Rollup merge of #79329 - camelid:int-lit-suffix-error, r=davidtwco
jonas-schievink Nov 26, 2020
ec3cfbc
Rollup merge of #79362 - cjgillot:relou, r=oli-obk
jonas-schievink Nov 26, 2020
c0b0f66
Rollup merge of #79365 - richkadel:llvm-cov-map-version-4, r=wesleywiser
jonas-schievink Nov 26, 2020
7d090ad
Rollup merge of #79402 - bugadani:typos, r=matthewjasper
jonas-schievink Nov 26, 2020
c7ce067
Rollup merge of #79412 - GuillaumeGomez:cleanup-rustdoc-tests, r=jyn514
jonas-schievink Nov 26, 2020
7c65f83
Rollup merge of #79413 - Swatinem:rustdoc-persist-crate, r=GuillaumeG…
jonas-schievink Nov 26, 2020
af69ac2
Rollup merge of #79420 - njasm:patch_rustdoc, r=GuillaumeGomez
jonas-schievink Nov 26, 2020
674d8c3
Rollup merge of #79421 - camelid:_match-docs-fmt, r=petrochenkov
jonas-schievink Nov 26, 2020
bec2441
Rollup merge of #79428 - camelid:fixup-compiler-docs, r=davidtwco
jonas-schievink Nov 26, 2020
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
Prev Previous commit
Next Next commit
Apply suggestions from code review
Co-authored-by: Wesley Wiser <wwiser@gmail.com>
richkadel and wesleywiser authored Nov 25, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit b5fef37d23f4e4471caea5508ab18da20522e51f
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs
Original file line number Diff line number Diff line change
@@ -169,7 +169,7 @@ impl CoverageMapGenerator {
);

// Create the coverage data header (Note, fields 0 and 2 are now always zero,
// as of `llvm::coverage::CovMapVersion::Version4`.
// as of `llvm::coverage::CovMapVersion::Version4`.)
let zero_was_n_records_val = cx.const_u32(0);
let filenames_size_val = cx.const_u32(filenames_size as u32);
let zero_was_coverage_size_val = cx.const_u32(0);
2 changes: 1 addition & 1 deletion src/test/run-make-fulldeps/coverage-llvmir-base/Makefile
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ else
-DINSTR_PROF_ORDERFILE='$(DATA_SECTION_PREFIX)__llvm_orderfile'
endif

ifeq ($(LLVM_VERSION_11_PLUS),false)
ifeq ($(LLVM_VERSION_11_PLUS),true)
all: test_llvm_ir
else
$(info Rust option `-Z instrument-coverage` requires LLVM 11 or higher. Test skipped.)