Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 22 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
vfs = { path = "./crates/vfs", version = "0.0.0" }
edition = { path = "./crates/edition", version = "0.0.0" }

ra-ap-rustc_lexer = { version = "0.131", default-features = false }
ra-ap-rustc_parse_format = { version = "0.131", default-features = false }
ra-ap-rustc_index = { version = "0.131", default-features = false }
ra-ap-rustc_abi = { version = "0.131", default-features = false }
ra-ap-rustc_pattern_analysis = { version = "0.131", default-features = false }
ra-ap-rustc_ast_ir = { version = "0.131", default-features = false }
ra-ap-rustc_type_ir = { version = "0.131", default-features = false }
ra-ap-rustc_next_trait_solver = { version = "0.131", default-features = false }
ra-ap-rustc_lexer = { version = "0.132", default-features = false }
ra-ap-rustc_parse_format = { version = "0.132", default-features = false }
ra-ap-rustc_index = { version = "0.132", default-features = false }
ra-ap-rustc_abi = { version = "0.132", default-features = false }
ra-ap-rustc_pattern_analysis = { version = "0.132", default-features = false }
ra-ap-rustc_ast_ir = { version = "0.132", default-features = false }
ra-ap-rustc_type_ir = { version = "0.132", default-features = false }
ra-ap-rustc_next_trait_solver = { version = "0.132", default-features = false }

# local crates that aren't published to crates.io. These should not have versions.

Expand Down
6 changes: 2 additions & 4 deletions crates/hir-ty/src/next_solver/inspect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ pub use rustc_next_trait_solver::solve::inspect::*;

use rustc_ast_ir::try_visit;
use rustc_next_trait_solver::{
canonical::instantiate_canonical_state,
resolve::eager_resolve_vars,
solve::{
SolverDelegateEvalExt,
inspect::{self, instantiate_canonical_state},
},
solve::{SolverDelegateEvalExt, inspect},
};
use rustc_type_ir::{
VisitorResult,
Expand Down
Loading