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

update from origin 2020-06-27 #7

Merged
merged 230 commits into from
Jun 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
230 commits
Select commit Hold shift + click to select a range
f03cf99
Add a fast path for `std::thread::panicking`.
eduardosm May 26, 2020
e4b7d2c
Omit DW_AT_linkage_name when it is the same as DW_AT_name
tmiasko May 26, 2020
2031e99
Added implementations for TryFrom<{int}> for NonZero{int}
poliorcetics May 29, 2020
d8b51f1
Added tests for the implementations
poliorcetics May 29, 2020
69b2179
Print accessed env vars as special comments into depinfo files
petrochenkov May 3, 2020
e85df08
Don't move cursor in search box when using arrows to navigate search …
carols10cents Jun 2, 2020
0dcb392
Added implementations for NonZero(U|I)size
poliorcetics Jun 8, 2020
2b8e2f8
Correctly format the tests and import TryFrom
poliorcetics Jun 8, 2020
6c8d8d6
Fix test call for error case
poliorcetics Jun 8, 2020
a4b8bb8
warn on macro_use attr
DevinR528 Feb 26, 2020
ede366b
collected all the imports and names
DevinR528 Mar 4, 2020
8ffbf6f
use hashset not map for keeping track of seen macro refs
DevinR528 Mar 13, 2020
1d9e80a
remove session
DevinR528 Mar 24, 2020
8bc106b
fix some of the review, rename, fmt, refactor
DevinR528 May 10, 2020
451363d
still working on displaying nested imports
DevinR528 May 14, 2020
d4f60b5
wip: of handling nested import paths for multi-macro paths
DevinR528 May 15, 2020
8c5a5a9
cleaned up import suggestion formatter, look into code reuse with wil…
DevinR528 May 26, 2020
288df59
Fix suggestion output, add run-rustfix to test file, stop sorting imp…
DevinR528 Jun 7, 2020
8db2484
Merge commit 'ff0993c5e9162ddaea78e83d0f0161e68bd4ea73' into clippy
tesuji Jun 9, 2020
e521a4e
Add enough attrs to the test file so the fix compiles with no errors,…
DevinR528 Jun 7, 2020
f065d4b
Auto merge of #5279 - DevinR528:macro-use-sugg, r=flip1995
bors Jun 9, 2020
a083b84
if_same_then_else: don't assume multiplication is always commutative
ebroto Jun 9, 2020
2f74283
Add a comment linking to the issue
ebroto Jun 9, 2020
7427065
Auto merge of #5702 - ebroto:5698_mul_not_comm, r=matthiaskrgr
bors Jun 9, 2020
c9bd35c
Migrate to numeric associated consts
tesuji Jun 2, 2020
6b3ee8f
Update Clippy for MethodCall changes
Aaron1011 Jun 9, 2020
e2e2a0f
Clippy fixes
Aaron1011 Jun 10, 2020
56f25e3
Downgrade unnested_or_patterns to pedantic
dtolnay Jun 11, 2020
840786a
clippy-driver: pass all args after "--rustc" to rustc.
matthiaskrgr May 31, 2020
88ab104
add test and remove debug print
matthiaskrgr Jun 2, 2020
f1d5cd5
add test for compiler output when compiling with rustc/clippy-driver
matthiaskrgr Jun 7, 2020
7a62380
clippy-driver: fix test and add --rustc to --help output
matthiaskrgr Jun 9, 2020
857ea16
Remove associated opaque types
matthewjasper May 10, 2020
af9b092
Remove ImplItemKind::OpaqueTy from clippy
matthewjasper May 10, 2020
7c15f30
Rollup merge of #72906 - lzutao:migrate-numeric-assoc-consts, r=dtolnay
Dylan-DPC Jun 12, 2020
b21ef2b
Fix ICE in consts::binop
ebroto Jun 12, 2020
994a839
Stabilize Option::zip
tesuji Jun 13, 2020
dee794f
typo
lcnr Jun 13, 2020
f663a21
Remove `bar` from blacklisted names
Jun 13, 2020
c020e45
Update stderr to match, and reinforce comments
Jun 14, 2020
454ed47
Update comment in conf.rs
Jun 14, 2020
8a6f42a
Fix typo in wildcard_imports
bugadani Jun 14, 2020
9217ef2
Auto merge of #72080 - matthewjasper:uniform-impl-trait, r=nikomatsakis
bors Jun 15, 2020
93696f4
Rollup merge of #72938 - lzutao:stabilize_option_zip, r=dtolnay
RalfJung Jun 15, 2020
8c1ee06
mem_replace_with_uninit: suggest std::ptr::read
esamudera Jun 7, 2020
a7743e9
redundant_pattern_matching: avoid non-const fn in const context
ebroto Jun 16, 2020
f3a40f5
Fix typo
sozysozbot Jun 17, 2020
b7f2396
Perform obligation deduplication to avoid buggy `ExistentialMismatch`
estebank Jun 18, 2020
922ff8e
Refactor hir::Place
arora-aman Jun 17, 2020
8a816ca
Cleanup MinGW LLVM linkage workaround
mati865 Jun 19, 2020
56e115a
Allow dynamic linking for iOS/tvOS targets.
Jun 19, 2020
f66bcc5
Add liballoc impl SpecFromElem for i8
pickfire Jun 20, 2020
1b47e8f
examples should be of type bool
tshepang Jun 20, 2020
16e741c
explain the logic a bit
tshepang Jun 20, 2020
b92602b
Make is_freeze and is_copy_modulo_regions take TyCtxtAt
RalfJung Jun 21, 2020
7cac209
add missing doc links
RalfJung Jun 21, 2020
55d207a
tweak wording
RalfJung Jun 21, 2020
cb8c94c
improve grammar
RalfJung Jun 21, 2020
8d0e882
Fix handling of reserved registers for ARM inline asm
Amanieu Jun 21, 2020
a98868d
Update asm! documentation
Amanieu Jun 21, 2020
314e621
Liballoc minor hash import tweak
pickfire Jun 22, 2020
9766a93
Document the mod keyword
poliorcetics Jun 22, 2020
3c46e36
Document the mut keyword
poliorcetics Jun 22, 2020
e84552e
be more consistent with "defaults" placement
tshepang Jun 22, 2020
ef24faf
Refactor non_ascii_idents lints, exclude ascii pair for confusable_id…
crlf0710 May 10, 2020
e11b873
Stop using old version of `syn` in `rustc-workspace-hack`
Aaron1011 Jun 22, 2020
2792014
Make AssocOp Copy
flip1995 Jun 22, 2020
b65ea1b
place non-obvious defaults on a separate line
tshepang Jun 22, 2020
0a454e5
Add UI test for issue 73592
nbdd0121 Jun 22, 2020
018440c
Merge remote-tracking branch 'upstream/master' into rustup
flip1995 Jun 23, 2020
51592f8
Fix sync fallout
flip1995 Jun 23, 2020
fa0f6a8
Auto merge of #5711 - flip1995:rustup, r=flip1995
bors Jun 23, 2020
1d077f6
Rollup merge of #73578 - RalfJung:ty-ctxt-at, r=jonas-schievink
Dylan-DPC Jun 23, 2020
9267b4f
Remove unused crate imports in 2018 edition crates
nn1ks Jun 23, 2020
7930f9a
Change heuristic for determining range literal
ayazhafiz Jun 23, 2020
c56c7e2
Auto merge of #5695 - esamudera:lint_mem_uninitialized, r=phansch,oli…
bors Jun 23, 2020
52c4864
Improve end of expression check in for loop lints
Jun 11, 2020
51c3b42
Add more specific GitHub issue templates
tesuji Jun 23, 2020
bb882d7
Add test for issue-44861
JohnTitor Jun 23, 2020
43ef554
Add test for issue-51506
JohnTitor Jun 23, 2020
e817cd2
Add test for issue-59435
JohnTitor Jun 23, 2020
814782b
Add test for issue-69840
JohnTitor Jun 23, 2020
404df1c
Add re-exports to use suggestions
da-x Jun 21, 2020
4cc2fa9
Auto merge of #5739 - flip1995:rustup, r=flip1995
bors Jun 23, 2020
ed083cc
Use lints in Clippy that are enabled in rustc bootstrap
flip1995 Jun 13, 2020
b886c06
Fix fallout
flip1995 Jun 13, 2020
7c61be6
Rollup merge of #5178 - matthiaskrgr:rustc_arg_pass, r=flip1995
flip1995 Jun 23, 2020
1f39eeb
Rollup merge of #5705 - dtolnay:orpat, r=flip1995
flip1995 Jun 23, 2020
9505919
Rollup merge of #5709 - ebroto:5389_ice, r=Manishearth
flip1995 Jun 23, 2020
24b77ea
Rollup merge of #5710 - lcnr:patch-1, r=flip1995
flip1995 Jun 23, 2020
0799be7
Rollup merge of #5712 - ijijn:master, r=flip1995
flip1995 Jun 23, 2020
598a79f
Rollup merge of #5713 - flip1995:more_lints, r=Manishearth
flip1995 Jun 23, 2020
68c0b24
Rollup merge of #5716 - bugadani:patch-1, r=matthiaskrgr
flip1995 Jun 23, 2020
f562117
Rollup merge of #5724 - ebroto:5697_const_result_option, r=Manishearth
flip1995 Jun 23, 2020
e4cbd1d
Rollup merge of #5726 - sozysozbot:patch-1, r=flip1995
flip1995 Jun 23, 2020
b452ad3
Auto merge of #5741 - flip1995:rollup-8chbwhy, r=flip1995
bors Jun 23, 2020
9504efc
Auto merge of #5735 - lzutao:issue-temp, r=flip1995
bors Jun 23, 2020
7374185
Remove unused allowed unused attributes
tesuji Jun 23, 2020
c420382
Auto merge of #5738 - mikerite:loops-20200623-2, r=matthiaskrgr
bors Jun 23, 2020
c2c07fa
Auto merge of #5740 - lzutao:unused-unused, r=flip1995
bors Jun 23, 2020
a2c0499
Merge commit 'c2c07fa9d095931eb5684a42942a7b573a0c5238' into clippyup
flip1995 Jun 23, 2020
86f6c0e
Record span of `const` kw in GenericParamKind
ayazhafiz Jun 21, 2020
f37c157
Update map.rs
nrabulinski Jun 23, 2020
037e930
Review fixes
da-x Jun 23, 2020
9bb414f
Fix ptr doc warnings.
ehuss Jun 23, 2020
5aab1a9
Tweak binop errors
estebank Jun 24, 2020
e02dafc
Update books
ehuss Jun 24, 2020
b23baa7
fix
tshepang Jun 24, 2020
7b9b580
Update cargo
ehuss Jun 24, 2020
ecb8b9f
Update Chalk
jackh726 May 27, 2020
d8ea10c
Document the return keyword
poliorcetics Jun 24, 2020
f3b1582
Update libunwind build process for x86_64-fortanix-unknown-sgx target
AdrianCX Jun 23, 2020
14ea7a7
lints: add `improper_ctypes_definitions`
davidtwco May 28, 2020
5c86348
improper_ctypes: allow pointers to sized types
davidtwco May 28, 2020
4504648
improper_ctypes: only allow params in defns mode
davidtwco Jun 21, 2020
65becef
Clean up E0701 explanation
GuillaumeGomez Jun 24, 2020
0366163
Document the self keyword
poliorcetics Jun 24, 2020
0b66a89
Auto merge of #73679 - ehuss:update-cargo, r=ehuss
bors Jun 24, 2020
38c85b7
Rollup merge of #73638 - yuqio:remove-unused-crate-imports, r=nikomat…
Dylan-DPC Jun 24, 2020
1d1c400
Rollup merge of #73639 - ayazhafiz:i/73553, r=davidtwco
Dylan-DPC Jun 24, 2020
45de677
Rollup merge of #73646 - JohnTitor:add-tests, r=Dylan-DPC
Dylan-DPC Jun 24, 2020
2a6e660
Rollup merge of #73652 - da-x:add-reexported-to-use-suggestions, r=pe…
Dylan-DPC Jun 24, 2020
c4e15b5
Rollup merge of #73667 - nrabulinski:master, r=Dylan-DPC
Dylan-DPC Jun 24, 2020
be8f381
Rollup merge of #73675 - ehuss:update-books, r=ehuss
Dylan-DPC Jun 24, 2020
f44b8b9
Document the Self keyword
poliorcetics Jun 24, 2020
78baf42
Add procedure for prioritization notifications on Zulip
LeSeulArtichaut Jun 24, 2020
d36d351
Implement intrinsic
doctorn Jun 23, 2020
c2dfc25
Fix tests
doctorn Jun 24, 2020
4931996
Fix tests
doctorn Jun 24, 2020
5881b52
Change wg-prioritization stream
spastorino Jun 24, 2020
ff06876
Alert @WG-prioritization/alerts instead of @WG-prioritization
spastorino Jun 24, 2020
d8ed1b0
Auto merge of #73692 - Dylan-DPC:rollup-ehzsbfw, r=Dylan-DPC
bors Jun 24, 2020
771a1d8
Make `std::panicking::panic_count::is_zero` inline and move the slow …
eduardosm Jun 24, 2020
67100f6
Auto merge of #73660 - flip1995:clippyup, r=nikomatsakis
bors Jun 24, 2020
09af184
review comments: clean up code
estebank Jun 24, 2020
2735f43
Fix links in `SliceIndex` documentation
LeSeulArtichaut Jun 24, 2020
a5a831f
Emit line info for generator variants
tmandry Jun 17, 2020
eb726c0
Add Artificial flag to generator variants
tmandry Jun 18, 2020
367858a
Add test for generator debuginfo
tmandry Jun 18, 2020
242a5cd
Allow calling GeneratorSubsts::variant_name() without substs
tmandry Jun 20, 2020
547d863
Improve GeneratorLayout debug output
tmandry Jun 20, 2020
477ecc5
Generalize generator-debug test a bit
tmandry Jun 23, 2020
2d652d9
Add generator-debug test for MSVC
tmandry Jun 23, 2020
fe3df64
Give up on checking filename
tmandry Jun 24, 2020
887fbd9
Split out async fn and generator test
tmandry Jun 24, 2020
a13d467
Implement associated lang items
Aaron1011 May 25, 2020
8f40dae
Suggest type param trait bound for binop only when appropriate
estebank Jun 24, 2020
67db7a2
Rollup merge of #72700 - davidtwco:issue-66220-improper-ctypes-declar…
Dylan-DPC Jun 25, 2020
d6c674b
Rollup merge of #73516 - Crabapple-iOS:feature/apple-dynamic-linking,…
Dylan-DPC Jun 25, 2020
6c1a91e
Rollup merge of #73616 - pickfire:liballoc-hash, r=joshtriplett
Dylan-DPC Jun 25, 2020
3b71097
Rollup merge of #73634 - nbdd0121:typeck, r=nikomatsakis
Dylan-DPC Jun 25, 2020
a5839f3
Rollup merge of #73688 - poliorcetics:self-keyword, r=joshtriplett
Dylan-DPC Jun 25, 2020
8d1934e
Rollup merge of #73698 - spastorino:patch-1, r=wesleywiser
Dylan-DPC Jun 25, 2020
520461f
Provide suggestions for some moved value errors
estebank Jun 20, 2020
3d09017
Add a compile fail example, binding -> variable, apply suggestions
poliorcetics Jun 25, 2020
229e5b2
Auto merge of #72559 - Aaron1011:feature/assoc-lang-items, r=oli-obk
bors Jun 25, 2020
2e3f517
Add unstable rustc option to control self-contained linkage mode
mati865 May 28, 2020
54293c1
Rename get_self_contained_lib_path
mati865 Jun 22, 2020
f27dcd7
Rename remaining `fallback` to `self_contained`
mati865 Jun 25, 2020
5232e20
Document the super keyword
poliorcetics Jun 25, 2020
343a921
Fix comments
AdrianCX Jun 25, 2020
db6fa2f
Remove deprecated comments
AdrianCX Jun 25, 2020
11a3584
emitter: column width defaults to 140
davidtwco Jun 25, 2020
eb6d9a4
Add E0766 error for unterminated double quote byte string
GuillaumeGomez Jun 21, 2020
33302fa
Update UI test
GuillaumeGomez Jun 21, 2020
9f3c96b
Auto merge of #73711 - Dylan-DPC:rollup-kzx15of, r=Dylan-DPC
bors Jun 25, 2020
8b368db
Bootstrap: fallback detection of Windows
ajpaverd Jun 25, 2020
1a355a2
Document some invariants correctly/more
oli-obk Jun 25, 2020
50fc24d
Auto merge of #72717 - poliorcetics:try-from-int-to-nzint, r=dtolnay
bors Jun 25, 2020
25e864e
Implement mixed script confusable lint.
crlf0710 Jun 23, 2020
f13d89e
disable collectionbenches for android
nellshamrell Jun 25, 2020
5c88b51
add exception for liballoc benches to tidy
nellshamrell Jun 25, 2020
77b0ed7
proc_macro: Stop flattening groups with dummy spans
petrochenkov Jun 7, 2020
f9af59d
Remove irrelevant comment
nbdd0121 Jun 25, 2020
1033351
Auto merge of #71858 - petrochenkov:env, r=Mark-Simulacrum
bors Jun 25, 2020
0cf4b9d
rustc_lint: only query `typeck_tables_of` when a lint needs it.
eddyb Jun 25, 2020
5158b3c
Rollup merge of #72617 - eduardosm:panicking, r=Amanieu
Manishearth Jun 26, 2020
9275ff7
Rollup merge of #72738 - mati865:self-contained-option, r=petrochenkov
Manishearth Jun 26, 2020
23c9ac6
Rollup merge of #72770 - crlf0710:mixed_script_confusable, r=Manishearth
Manishearth Jun 26, 2020
c50d981
Rollup merge of #73418 - doctorn:variants-intrinsic, r=kennytm
Manishearth Jun 26, 2020
3f5b8c8
Rollup merge of #73460 - tmandry:variant-lineinfo, r=oli-obk
Manishearth Jun 26, 2020
4a245ae
Rollup merge of #73534 - estebank:borrowck-suggestions, r=matthewjasper
Manishearth Jun 26, 2020
0d5cfb4
Rollup merge of #73538 - tshepang:fix-example, r=nikomatsakis
Manishearth Jun 26, 2020
0d03456
Rollup merge of #73581 - GuillaumeGomez:add-0766, r=varkor
Manishearth Jun 26, 2020
01a293a
Rollup merge of #73619 - poliorcetics:mod-keyword, r=steveklabnik
Manishearth Jun 26, 2020
f91330a
Rollup merge of #73621 - poliorcetics:mut-keyword, r=steveklabnik
Manishearth Jun 26, 2020
131e254
Rollup merge of #73648 - poliorcetics:return-keyword, r=joshtriplett
Manishearth Jun 26, 2020
91f8766
Rollup merge of #73673 - ehuss:fix-ptr-docs, r=oli-obk
Manishearth Jun 26, 2020
7fb7765
Rollup merge of #73674 - estebank:op-trait-bound-suggestion, r=davidtwco
Manishearth Jun 26, 2020
8c5d794
Rollup merge of #73687 - GuillaumeGomez:cleanup-e0701, r=Dylan-DPC
Manishearth Jun 26, 2020
e093b65
Auto merge of #73746 - Manishearth:rollup-80jnynm, r=Manishearth
bors Jun 26, 2020
d279b3c
Add code block to code in documentation of `List::rebase_onto`
jyn514 Jun 26, 2020
75983e1
Support configurable deny-warnings for all in-tree crates.
ehuss Jun 12, 2020
14e65d5
Auto merge of #73743 - eddyb:lint-on-demand-typeck-tables, r=Manishearth
bors Jun 26, 2020
14dc103
Rollup merge of #72620 - tmiasko:linkage-name, r=eddyb
Manishearth Jun 26, 2020
a25fbb9
Rollup merge of #72967 - integer32llc:prevent-default-arrows, r=kinnison
Manishearth Jun 26, 2020
2aee608
Rollup merge of #73102 - petrochenkov:flatgroup, r=Aaron1011
Manishearth Jun 26, 2020
10d655b
Rollup merge of #73297 - ehuss:tool-warnings, r=Mark-Simulacrum
Manishearth Jun 26, 2020
25671fa
Rollup merge of #73507 - mati865:cleanup-mingw-llvm-linkage, r=matthe…
Manishearth Jun 26, 2020
81d2d3c
Rollup merge of #73588 - Amanieu:thumb-fp, r=nagisa
Manishearth Jun 26, 2020
7f6dfb4
Rollup merge of #73597 - ayazhafiz:i/const-span, r=ecstatic-morse
Manishearth Jun 26, 2020
3d7521d
Rollup merge of #73629 - flip1995:assoc_op_copy_clone, r=Manishearth
Manishearth Jun 26, 2020
1755e3b
Rollup merge of #73681 - jackh726:chalk-0.14, r=nikomatsakis
Manishearth Jun 26, 2020
6061752
Rollup merge of #73707 - LeSeulArtichaut:patch-3, r=kennytm
Manishearth Jun 26, 2020
97ccd97
Rollup merge of #73719 - davidtwco:issue-72509-emitter-column-width, …
Manishearth Jun 26, 2020
91a638d
Rollup merge of #73729 - nellshamrell:disable-collectionsbenches-andr…
Manishearth Jun 26, 2020
a7eee3c
Rollup merge of #73748 - jyn514:doc-fix, r=Manishearth
Manishearth Jun 26, 2020
42062a5
Shortcuts for min/max on ordinary BTreeMap/BTreeSet iterators
ssomers Jun 22, 2020
819cde5
Show the values and computation that would overflow a const evaluatio…
oli-obk Jun 19, 2020
9672b5e
Auto merge of #73756 - Manishearth:rollup-aehswb2, r=Manishearth
bors Jun 26, 2020
6f8bec9
Warn if linking to a private item
jyn514 May 13, 2020
20552c8
Generate docs for links to private items when passed --document-private
jyn514 May 30, 2020
6742382
Fix debug messages
jyn514 Jun 26, 2020
cb152ea
Remove blank line
kraai Jun 26, 2020
7750c3d
Auto merge of #73513 - oli-obk:const_binop_overflow, r=estebank
bors Jun 26, 2020
7b2064f
rustc_lexer: Simplify shebang parsing once more
petrochenkov Jun 21, 2020
8adc781
Rollup merge of #72771 - jyn514:rustdoc, r=Manishearth
Manishearth Jun 26, 2020
38cbf15
Rollup merge of #72937 - AdrianCX:master, r=nikomatsakis
Manishearth Jun 26, 2020
f13d09a
Rollup merge of #73485 - estebank:dedup-preds, r=nikomatsakis
Manishearth Jun 26, 2020
23b0776
Rollup merge of #73529 - pickfire:liballoc-specfromelem-i8, r=cuviper
Manishearth Jun 26, 2020
92af945
Rollup merge of #73579 - RalfJung:doc-missing-links, r=shepmaster
Manishearth Jun 26, 2020
dfbba65
Rollup merge of #73627 - ssomers:btree_iter_min_max, r=Mark-Simulacrum
Manishearth Jun 26, 2020
c18e919
Rollup merge of #73691 - ajpaverd:bootstrap-windows-73689, r=Mark-Sim…
Manishearth Jun 26, 2020
8d9c00d
Rollup merge of #73694 - poliorcetics:self-upper-keyword, r=Mark-Simu…
Manishearth Jun 26, 2020
bc10bb0
Rollup merge of #73718 - poliorcetics:super-keyword, r=shepmaster
Manishearth Jun 26, 2020
83f6d0a
Rollup merge of #73728 - oli-obk:const_prop_cleanup, r=wesleywiser
Manishearth Jun 26, 2020
7926c64
Rollup merge of #73738 - nbdd0121:comment, r=nikomatsakis
Manishearth Jun 26, 2020
50026ae
Rollup merge of #73765 - kraai:remove-blank-line, r=jonas-schievink
Manishearth Jun 26, 2020
dda8a7f
Auto merge of #73596 - petrochenkov:shebang2, r=Mark-Simulacrum
bors Jun 26, 2020
394e1b4
Auto merge of #73779 - Manishearth:rollup-lwqd9jm, r=Manishearth
bors Jun 27, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
57 changes: 45 additions & 12 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,9 @@ dependencies = [

[[package]]
name = "chalk-derive"
version = "0.11.0"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b9bd01eab87277d973183a1d2e56bace1c11f8242c52c20636fb7dddf343ac9"
checksum = "d463e01905d607e181de72e8608721d3269f29176c9a14ce037011316ae7131d"
dependencies = [
"proc-macro2 1.0.3",
"quote 1.0.2",
Expand All @@ -446,30 +446,31 @@ dependencies = [

[[package]]
name = "chalk-engine"
version = "0.11.0"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c7a637c3d17ed555aef16e16952a5d1e127bd55178cc30be22afeb92da90c7d"
checksum = "efaf428f5398d36284f79690cf988762b7c091249f50a6c11db613a46c057000"
dependencies = [
"chalk-derive",
"chalk-ir",
"rustc-hash",
"tracing",
]

[[package]]
name = "chalk-ir"
version = "0.11.0"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "595e5735ded16c3f3dc348f7b15bbb2521a0080b1863cac38ad5271589944670"
checksum = "fd3fdc1e9f68498ffe80f4a23b0b95f1ca6fb21d5a4c9b0c085fab3ca712bdbe"
dependencies = [
"chalk-derive",
"lazy_static",
]

[[package]]
name = "chalk-solve"
version = "0.11.0"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d9d938139db425867a30cc0cfec0269406d8238d0571d829041eaa7a8455d11"
checksum = "5b9fd4102807b7ebe8fb034fa0f488c5656e1966d3261b558b81a08d519cdb29"
dependencies = [
"chalk-derive",
"chalk-engine",
Expand All @@ -478,6 +479,7 @@ dependencies = [
"itertools 0.9.0",
"petgraph",
"rustc-hash",
"tracing",
]

[[package]]
Expand Down Expand Up @@ -5332,6 +5334,37 @@ dependencies = [
"syn 0.15.35",
]

[[package]]
name = "tracing"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a41f40ed0e162c911ac6fcb53ecdc8134c46905fdbbae8c50add462a538b495f"
dependencies = [
"cfg-if",
"tracing-attributes",
"tracing-core",
]

[[package]]
name = "tracing-attributes"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99bbad0de3fd923c9c3232ead88510b783e5a4d16a6154adffa3d53308de984c"
dependencies = [
"proc-macro2 1.0.3",
"quote 1.0.2",
"syn 1.0.11",
]

[[package]]
name = "tracing-core"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0aa83a9a47081cd522c09c81b31aec2c9273424976f922ad61c053b58350b715"
dependencies = [
"lazy_static",
]

[[package]]
name = "try-lock"
version = "0.2.2"
Expand Down Expand Up @@ -5405,15 +5438,15 @@ dependencies = [

[[package]]
name = "unicode-script"
version = "0.4.0"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b2c5c29e805da6817f5af6a627d65adb045cebf05cccd5a3493d6109454391c"
checksum = "58b33414ea8db4b7ea0343548dbdc31d27aef06beacf7044a87e564d9b0feb7d"

[[package]]
name = "unicode-security"
version = "0.0.3"
version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5f9011bbed9c13372bc8df618b55a38138445199caf3b61d432c6859c36dee0"
checksum = "5d87c28edc5b263377e448d6cdcb935c06b95413d8013ba6fae470558ccab18f"
dependencies = [
"unicode-normalization",
"unicode-script",
Expand Down
38 changes: 28 additions & 10 deletions config.toml.example
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,24 @@
# nightlies are already produced for. The current platform must be able to run
# binaries of this build triple and the nightly will be used to bootstrap the
# first compiler.
#build = "x86_64-unknown-linux-gnu" # defaults to your host platform
#
# Defaults to host platform
#build = "x86_64-unknown-linux-gnu"

# In addition to the build triple, other triples to produce full compiler
# toolchains for. Each of these triples will be bootstrapped from the build
# triple and then will continue to bootstrap themselves. This platform must
# currently be able to run all of the triples provided here.
#host = ["x86_64-unknown-linux-gnu"] # defaults to just the build triple
#
# Defaults to just the build triple
#host = ["x86_64-unknown-linux-gnu"]

# In addition to all host triples, other triples to produce the standard library
# for. Each host triple will be used to produce a copy of the standard library
# for each target triple.
#target = ["x86_64-unknown-linux-gnu"] # defaults to just the build triple
#
# Defaults to just the build triple
#target = ["x86_64-unknown-linux-gnu"]

# Use this directory to store build artifacts.
# You can use "$ROOT" to indicate the root of the git repository.
Expand Down Expand Up @@ -174,7 +180,7 @@
# Python interpreter to use for various tasks throughout the build, notably
# rustdoc tests, the lldb python interpreter, and some dist bits and pieces.
#
# Defaults to the Python interpreter used to execute x.py.
# Defaults to the Python interpreter used to execute x.py
#python = "python"

# Force Cargo to check that Cargo.lock describes the precise dependency
Expand Down Expand Up @@ -313,11 +319,15 @@

# Whether or not debug assertions are enabled for the compiler and standard
# library.
#debug-assertions = debug
#
# Defaults to rust.debug value
#debug-assertions = false

# Whether or not debug assertions are enabled for the standard library.
# Overrides the `debug-assertions` option, if defined.
#debug-assertions-std = debug-assertions
#
# Defaults to rust.debug-assertions value
#debug-assertions-std = false

# Debuginfo level for most of Rust code, corresponds to the `-C debuginfo=N` option of `rustc`.
# `0` - no debug info
Expand All @@ -326,16 +336,24 @@
# Can be overridden for specific subsets of Rust code (rustc, std or tools).
# Debuginfo for tests run with compiletest is not controlled by this option
# and needs to be enabled separately with `debuginfo-level-tests`.
#debuginfo-level = if debug { 2 } else { 0 }
#
# Defaults to 2 if debug is true
#debuginfo-level = 0

# Debuginfo level for the compiler.
#debuginfo-level-rustc = debuginfo-level
#
# Defaults to rust.debuginfo-level value
#debuginfo-level-rustc = 0

# Debuginfo level for the standard library.
#debuginfo-level-std = debuginfo-level
#
# Defaults to rust.debuginfo-level value
#debuginfo-level-std = 0

# Debuginfo level for the tools.
#debuginfo-level-tools = debuginfo-level
#
# Defaults to rust.debuginfo-level value
#debuginfo-level-tools = 0

# Debuginfo level for the test suites run with compiletest.
# FIXME(#61117): Some tests fail when this option is enabled.
Expand Down
6 changes: 6 additions & 0 deletions src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ def default_build_triple():
ostype = require(["uname", "-s"], exit=required)
cputype = require(['uname', '-m'], exit=required)

# If we do not have `uname`, assume Windows.
if ostype is None or cputype is None:
return 'x86_64-pc-windows-msvc'

Expand Down Expand Up @@ -236,6 +237,11 @@ def default_build_triple():
if ostype.endswith('WOW64'):
cputype = 'x86_64'
ostype = 'pc-windows-gnu'
elif sys.platform == 'win32':
# Some Windows platforms might have a `uname` command that returns a
# non-standard string (e.g. gnuwin32 tools returns `windows32`). In
# these cases, fall back to using sys.platform.
return 'x86_64-pc-windows-msvc'
else:
err = "unknown OS type: {}".format(ostype)
sys.exit(err)
Expand Down
5 changes: 3 additions & 2 deletions src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use crate::install;
use crate::native;
use crate::run;
use crate::test;
use crate::tool;
use crate::tool::{self, SourceType};
use crate::util::{self, add_dylib_path, add_link_lib_path, exe, libdir};
use crate::{Build, DocTests, GitRepo, Mode};

Expand Down Expand Up @@ -759,6 +759,7 @@ impl<'a> Builder<'a> {
&self,
compiler: Compiler,
mode: Mode,
source_type: SourceType,
target: Interned<String>,
cmd: &str,
) -> Cargo {
Expand Down Expand Up @@ -1125,7 +1126,7 @@ impl<'a> Builder<'a> {

cargo.env("RUSTC_VERBOSE", self.verbosity.to_string());

if !mode.is_tool() {
if source_type == SourceType::InTree {
// When extending this list, add the new lints to the RUSTFLAGS of the
// build_bootstrap function of src/bootstrap/bootstrap.py as well as
// some code doesn't go through this `rustc` wrapper.
Expand Down
29 changes: 22 additions & 7 deletions src/bootstrap/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,13 @@ impl Step for Std {
let target = self.target;
let compiler = builder.compiler(0, builder.config.build);

let mut cargo = builder.cargo(compiler, Mode::Std, target, cargo_subcommand(builder.kind));
let mut cargo = builder.cargo(
compiler,
Mode::Std,
SourceType::InTree,
target,
cargo_subcommand(builder.kind),
);
std_cargo(builder, target, compiler.stage, &mut cargo);

builder.info(&format!("Checking std artifacts ({} -> {})", &compiler.host, target));
Expand Down Expand Up @@ -92,8 +98,13 @@ impl Step for Rustc {

builder.ensure(Std { target });

let mut cargo =
builder.cargo(compiler, Mode::Rustc, target, cargo_subcommand(builder.kind));
let mut cargo = builder.cargo(
compiler,
Mode::Rustc,
SourceType::InTree,
target,
cargo_subcommand(builder.kind),
);
rustc_cargo(builder, &mut cargo, target);

builder.info(&format!("Checking compiler artifacts ({} -> {})", &compiler.host, target));
Expand All @@ -113,7 +124,7 @@ impl Step for Rustc {
}

macro_rules! tool_check_step {
($name:ident, $path:expr) => {
($name:ident, $path:expr, $source_type:expr) => {
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
pub struct $name {
pub target: Interned<String>,
Expand Down Expand Up @@ -145,7 +156,7 @@ macro_rules! tool_check_step {
target,
cargo_subcommand(builder.kind),
$path,
SourceType::InTree,
$source_type,
&[],
);

Expand Down Expand Up @@ -184,8 +195,12 @@ macro_rules! tool_check_step {
};
}

tool_check_step!(Rustdoc, "src/tools/rustdoc");
tool_check_step!(Clippy, "src/tools/clippy");
tool_check_step!(Rustdoc, "src/tools/rustdoc", SourceType::InTree);
// Clippy is a hybrid. It is an external tool, but uses a git subtree instead
// of a submodule. Since the SourceType only drives the deny-warnings
// behavior, treat it as in-tree so that any new warnings in clippy will be
// rejected.
tool_check_step!(Clippy, "src/tools/clippy", SourceType::InTree);

/// Cargo's output path for the standard library in a given stage, compiled
/// by a particular compiler for the specified target.
Expand Down
31 changes: 9 additions & 22 deletions src/bootstrap/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ use filetime::FileTime;
use serde::Deserialize;

use crate::builder::Cargo;
use crate::builder::{Builder, Kind, RunConfig, ShouldRun, Step};
use crate::cache::{Interned, INTERNER};
use crate::dist;
use crate::native;
use crate::tool::SourceType;
use crate::util::{exe, is_dylib, symlink_dir};
use crate::{Compiler, DependencyType, GitRepo, Mode};

use crate::builder::{Builder, Kind, RunConfig, ShouldRun, Step};
use crate::cache::{Interned, INTERNER};

#[derive(Debug, PartialOrd, Ord, Copy, Clone, PartialEq, Eq, Hash)]
pub struct Std {
pub target: Interned<String>,
Expand Down Expand Up @@ -87,7 +87,7 @@ impl Step for Std {
target_deps.extend(copy_third_party_objects(builder, &compiler, target));
target_deps.extend(copy_self_contained_objects(builder, &compiler, target));

let mut cargo = builder.cargo(compiler, Mode::Std, target, "build");
let mut cargo = builder.cargo(compiler, Mode::Std, SourceType::InTree, target, "build");
std_cargo(builder, target, compiler.stage, &mut cargo);

builder.info(&format!(
Expand Down Expand Up @@ -131,26 +131,13 @@ fn copy_third_party_objects(
compiler: &Compiler,
target: Interned<String>,
) -> Vec<(PathBuf, DependencyType)> {
let libdir = builder.sysroot_libdir(*compiler, target);
let mut target_deps = vec![];

// Copies libunwind.a compiled to be linked with x86_64-fortanix-unknown-sgx.
//
// This target needs to be linked to Fortanix's port of llvm's libunwind.
// libunwind requires support for rwlock and printing to stderr,
// which is provided by std for this target.
// FIXME: remove this in 2021
if target == "x86_64-fortanix-unknown-sgx" {
let src_path_env = "X86_FORTANIX_SGX_LIBS";
let src =
env::var(src_path_env).unwrap_or_else(|_| panic!("{} not found in env", src_path_env));
copy_and_stamp(
builder,
&*libdir,
Path::new(&src),
"libunwind.a",
&mut target_deps,
DependencyType::Target,
);
if env::var_os("X86_FORTANIX_SGX_LIBS").is_some() {
builder.info("Warning: X86_FORTANIX_SGX_LIBS environment variable is ignored, libunwind is now compiled as part of rustbuild");
}
}

if builder.config.sanitizers && compiler.stage != 0 {
Expand Down Expand Up @@ -513,7 +500,7 @@ impl Step for Rustc {
target: builder.config.build,
});

let mut cargo = builder.cargo(compiler, Mode::Rustc, target, "build");
let mut cargo = builder.cargo(compiler, Mode::Rustc, SourceType::InTree, target, "build");
rustc_cargo(builder, &mut cargo, target);

builder.info(&format!(
Expand Down
5 changes: 3 additions & 2 deletions src/bootstrap/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,8 @@ impl Step for Std {
t!(fs::copy(builder.src.join("src/doc/rust.css"), out.join("rust.css")));

let run_cargo_rustdoc_for = |package: &str| {
let mut cargo = builder.cargo(compiler, Mode::Std, target, "rustdoc");
let mut cargo =
builder.cargo(compiler, Mode::Std, SourceType::InTree, target, "rustdoc");
compile::std_cargo(builder, target, compiler.stage, &mut cargo);

// Keep a whitelist so we do not build internal stdlib crates, these will be
Expand Down Expand Up @@ -534,7 +535,7 @@ impl Step for Rustc {
t!(symlink_dir_force(&builder.config, &out, &out_dir));

// Build cargo command.
let mut cargo = builder.cargo(compiler, Mode::Rustc, target, "doc");
let mut cargo = builder.cargo(compiler, Mode::Rustc, SourceType::InTree, target, "doc");
cargo.env(
"RUSTDOCFLAGS",
"--document-private-items \
Expand Down
Loading