Skip to content

Rollup of 7 pull requests #52567

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

Closed
wants to merge 26 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
829bc26
rustc: Remove a workaroudn in ThinLTO fixed upstream
alexcrichton Jul 18, 2018
6d50672
Reword when `_` couldn't be inferred
Jul 18, 2018
5332375
proc_macro: Preserve spans of attributes on functions
alexcrichton Jul 19, 2018
f775c6d
Fix docker/run.sh script when run locally
alexcrichton Jul 19, 2018
0320d1b
Add tests for #34784
wesleywiser Jul 20, 2018
2db7bec
Add compile-fail test for #33264
wesleywiser Jul 20, 2018
1aeed60
Add run-pass test for #44005
wesleywiser Jul 20, 2018
608caeb
Add compile-fail test for #42060
wesleywiser Jul 20, 2018
ea495e3
Add compile-fail test for #43196
wesleywiser Jul 20, 2018
3e0cb23
Update compile-fail tests to be ui tests
wesleywiser Jul 20, 2018
576cfc5
Remove duplicate E0396 tests
ljedrz Jul 19, 2018
c44f724
resolve: Remove unused parameter from `resolve_ident_in_module`
petrochenkov Jul 16, 2018
2214349
resolve: Rename `global_macros` to `macro_prelude`
petrochenkov Jul 16, 2018
c2533b6
resolve: Remove `SingleImports` in favor of a simple set
petrochenkov Jul 17, 2018
414a86e
resolve: Add some comments to in-module resolution
petrochenkov Jul 18, 2018
2eb83ee
data_structures: Add a reference wrapper for pointer-indexed maps/sets
petrochenkov Jul 18, 2018
32453db
resolve: Fully prohibit shadowing of in-scope names by globs in macro…
petrochenkov Jul 19, 2018
e7aeb2b
resolve: Add more comments to in-module resolution
petrochenkov Jul 19, 2018
382285a
Revert some use of `PtrKey` to fix parallel_queries build
petrochenkov Jul 20, 2018
3840645
Rollup merge of #52505 - alexcrichton:remove-thinlto-hack, r=nikomats…
pietroalbini Jul 20, 2018
a1234ef
Rollup merge of #52507 - estebank:infer-type, r=nikomatsakis
pietroalbini Jul 20, 2018
6cd5dbf
Rollup merge of #52527 - ljedrz:cleanup_13973, r=oli-obk
pietroalbini Jul 20, 2018
420cba6
Rollup merge of #52536 - alexcrichton:attr-spans, r=nikomatsakis
pietroalbini Jul 20, 2018
172524b
Rollup merge of #52540 - alexcrichton:tweak-script, r=kennytm
pietroalbini Jul 20, 2018
ec4d796
Rollup merge of #52555 - petrochenkov:mresfact, r=alexcrichton
pietroalbini Jul 20, 2018
6045d93
Rollup merge of #52558 - wesleywiser:ice_melting, r=estebank
pietroalbini Jul 20, 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
Prev Previous commit
Next Next commit
Revert some use of PtrKey to fix parallel_queries build
  • Loading branch information
petrochenkov committed Jul 20, 2018
commit 382285a01de393ecc9dd2c78c2518299d8749c12
5 changes: 2 additions & 3 deletions src/librustc/ty/query/job.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#![allow(warnings)]

use std::mem;
use rustc_data_structures::ptr_key::PtrKey;
use rustc_data_structures::sync::{Lock, LockGuard, Lrc, Weak};
use rustc_data_structures::OnDrop;
use syntax_pos::Span;
Expand Down Expand Up @@ -283,7 +282,7 @@ where
fn cycle_check<'tcx>(query: Lrc<QueryJob<'tcx>>,
span: Span,
stack: &mut Vec<(Span, Lrc<QueryJob<'tcx>>)>,
visited: &mut HashSet<PtrKey<'tcx, QueryJob<'tcx>>>
visited: &mut HashSet<*const QueryJob<'tcx>>
) -> Option<Option<Waiter<'tcx>>> {
if visited.contains(&query.as_ptr()) {
return if let Some(p) = stack.iter().position(|q| q.1.as_ptr() == query.as_ptr()) {
Expand Down Expand Up @@ -322,7 +321,7 @@ fn cycle_check<'tcx>(query: Lrc<QueryJob<'tcx>>,
#[cfg(parallel_queries)]
fn connected_to_root<'tcx>(
query: Lrc<QueryJob<'tcx>>,
visited: &mut HashSet<PtrKey<'tcx, QueryJob<'tcx>>>
visited: &mut HashSet<*const QueryJob<'tcx>>
) -> bool {
// We already visited this or we're deliberately ignoring it
if visited.contains(&query.as_ptr()) {
Expand Down