Skip to content

Rollup of 8 pull requests #86920

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

Merged
merged 27 commits into from
Jul 7, 2021
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9f57996
Add Integer::{log,log2,log10} variants
yoshuawuyts Jun 24, 2021
8c2a37a
Clean up rustdoc IDs
GuillaumeGomez Jun 9, 2021
3d20b2a
Test ManuallyDrop::clone_from.
m-ou-se Jul 5, 2021
a87fb18
Replace deprecated compare_and_swap by compare_exchange_weak in core:…
juniorbassani Jul 6, 2021
0d61e6e
Fix typo in core::sync::atomic::compiler_fence example
juniorbassani Jul 6, 2021
0b3653b
migrate cpu-usage-over-time.py to python 3
pietroalbini Jul 6, 2021
bbfb857
Rename disjoint_capture_migration lint to rust_2021_incompatible_clos…
rylev Jun 29, 2021
df71a99
Rename lint
rylev Jun 29, 2021
1d49658
Change or_patterns_back_compat lint to rust_2021_incompatible_or_patt…
rylev Jun 29, 2021
ecca9a8
Add s to FUTURE_PRELUDE_COLLISION
rylev Jun 29, 2021
6c87772
Rename reserved_prefix lint to reserved_prefixes
rylev Jun 29, 2021
3a45bb9
Fix mis-styled code
rylev Jun 29, 2021
4e5b78f
Allow lint names to have ascii numbers
rylev Jun 29, 2021
a902e25
Add s to non_fmt_panic
rylev Jun 29, 2021
81c11a2
rust_2021_token_prefixes
rylev Jun 30, 2021
941eb2a
Rename future_prelude_collisions to rust_2021_prelude_collisions
rylev Jul 1, 2021
d4e384b
rename rust_2021_token_prefixes to rust_2021_prefixes_incompatible_sy…
rylev Jul 6, 2021
fb464a3
rewrote documentation for thread::yield_now()
godmar Jul 6, 2021
1b4704d
Update books
ehuss Jul 7, 2021
9bbc470
Rollup merge of #80918 - yoshuawuyts:int-log2, r=m-ou-se
JohnTitor Jul 7, 2021
7e95290
Rollup merge of #86717 - rylev:rename, r=nikomatsakis
JohnTitor Jul 7, 2021
cbb40cd
Rollup merge of #86819 - GuillaumeGomez:cleanup-rustdoc-ids, r=jyn514
JohnTitor Jul 7, 2021
c630b6b
Rollup merge of #86880 - m-ou-se:test-manuallydrop-clone-from, r=Mark…
JohnTitor Jul 7, 2021
fe3d6a7
Rollup merge of #86906 - juniorbassani:update-sync-docs, r=yaahc
JohnTitor Jul 7, 2021
7be29c1
Rollup merge of #86907 - pietroalbini:ci-cpu-stats-python3, r=Mark-Si…
JohnTitor Jul 7, 2021
9aee3c2
Rollup merge of #86916 - godmar:@godmar/thread-yield-documentation-fi…
JohnTitor Jul 7, 2021
5196885
Rollup merge of #86919 - ehuss:update-books, r=ehuss
JohnTitor Jul 7, 2021
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
Fix mis-styled code
  • Loading branch information
rylev committed Jul 6, 2021
commit 3a45bb919c5aa1159939f6dfab2f79e55babf84c
5 changes: 4 additions & 1 deletion compiler/rustc_typeck/src/check/upvar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1829,7 +1829,10 @@ fn var_name(tcx: TyCtxt<'_>, var_hir_id: hir::HirId) -> Symbol {
tcx.hir().name(var_hir_id)
}

fn should_do_rust_2021_incompatible_closure_captures_analysis(tcx: TyCtxt<'_>, closure_id: hir::HirId) -> bool {
fn should_do_rust_2021_incompatible_closure_captures_analysis(
tcx: TyCtxt<'_>,
closure_id: hir::HirId,
) -> bool {
let (level, _) =
tcx.lint_level_at_node(lint::builtin::RUST_2021_INCOMPATIBLE_CLOSURE_CAPTURES, closure_id);

Expand Down