diff options
| author | bors <bors@rust-lang.org> | 2019-03-07 00:27:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-07 00:27:07 +0000 |
| commit | 88f755f8a84df1d9e6b17cf10c96ae8b93481b2e (patch) | |
| tree | 140a26d5dd27f9cec68ddef6a41e3fade7d46bd7 /src/librustc_codegen_utils | |
| parent | f22dca0a1bef4141e75326caacc3cd59f3d5be8e (diff) | |
| parent | de4478af91765999f51b2950bea16686ee4cd60a (diff) | |
| download | rust-88f755f8a84df1d9e6b17cf10c96ae8b93481b2e.tar.gz rust-88f755f8a84df1d9e6b17cf10c96ae8b93481b2e.zip | |
Auto merge of #58583 - varkor:const-generics-ty, r=oli-obk
Add const generics to ty (and transitive dependencies) Split out from #53645. This work is a collaborative effort with @yodaldevoid. There are a number of stubs. Some I plan to leave for the next PRs (e.g. `infer` and `rustdoc`). Others I can either fix up in this PR, or as follow ups (which would avoid the time-consuming rebasing). It was a little hard to split this up, as so much depends on ty and friends. Apologies for the large diff. r? @eddyb
Diffstat (limited to 'src/librustc_codegen_utils')
| -rw-r--r-- | src/librustc_codegen_utils/symbol_names.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_utils/symbol_names.rs b/src/librustc_codegen_utils/symbol_names.rs index f529cf30a62..76e74e9e2b4 100644 --- a/src/librustc_codegen_utils/symbol_names.rs +++ b/src/librustc_codegen_utils/symbol_names.rs @@ -172,7 +172,7 @@ fn get_symbol_hash<'a, 'tcx>( assert!(!substs.needs_subst()); substs.hash_stable(&mut hcx, &mut hasher); - let is_generic = substs.types().next().is_some(); + let is_generic = substs.non_erasable_generics().next().is_some(); let avoid_cross_crate_conflicts = // If this is an instance of a generic function, we also hash in // the ID of the instantiating crate. This avoids symbol conflicts |