From 73023c0299d4adeada026648c3684621f129e038 Mon Sep 17 00:00:00 2001
From: Jade <software@lfcode.ca>
Date: Wed, 12 May 2021 05:44:01 -0700
Subject: Support length for ByteStrings

I am not confident that my added byte string parsing is right.
---
 crates/hir_ty/src/infer/expr.rs   | 20 ++++++++++++++------
 crates/hir_ty/src/tests/simple.rs |  4 ++--
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'crates/hir_ty')

diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs
index 5e9420752..46e4777a4 100644
--- a/crates/hir_ty/src/infer/expr.rs
+++ b/crates/hir_ty/src/infer/expr.rs
@@ -16,7 +16,7 @@ use stdx::always;
 use syntax::ast::RangeOp;
 
 use crate::{
-    autoderef, dummy_usize_const,
+    autoderef,
     lower::lower_to_chalk_mutability,
     mapping::from_chalk,
     method_resolution, op,
@@ -24,8 +24,9 @@ use crate::{
     static_lifetime, to_chalk_trait_id,
     traits::FnTrait,
     utils::{generics, Generics},
-    AdtId, Binders, CallableDefId, ConstValue, FnPointer, FnSig, FnSubst, InEnvironment, Interner,
-    ProjectionTyExt, Rawness, Scalar, Substitution, TraitRef, Ty, TyBuilder, TyExt, TyKind,
+    AdtId, Binders, CallableDefId, ConcreteConst, ConstValue, FnPointer, FnSig, FnSubst,
+    InEnvironment, Interner, ProjectionTyExt, Rawness, Scalar, Substitution, TraitRef, Ty,
+    TyBuilder, TyExt, TyKind,
 };
 
 use super::{
@@ -758,11 +759,18 @@ impl<'a> InferenceContext<'a> {
                     TyKind::Ref(Mutability::Not, static_lifetime(), TyKind::Str.intern(&Interner))
                         .intern(&Interner)
                 }
-                Literal::ByteString(..) => {
+                Literal::ByteString(bs) => {
                     let byte_type = TyKind::Scalar(Scalar::Uint(UintTy::U8)).intern(&Interner);
 
-                    let array_type =
-                        TyKind::Array(byte_type, dummy_usize_const()).intern(&Interner);
+                    let len = ConstData {
+                        ty: TyKind::Scalar(Scalar::Uint(UintTy::Usize)).intern(&Interner),
+                        value: ConstValue::Concrete(ConcreteConst {
+                            interned: ConstScalar::Usize(bs.len() as u64),
+                        }),
+                    }
+                    .intern(&Interner);
+
+                    let array_type = TyKind::Array(byte_type, len).intern(&Interner);
                     TyKind::Ref(Mutability::Not, static_lifetime(), array_type).intern(&Interner)
                 }
                 Literal::Char(..) => TyKind::Scalar(Scalar::Char).intern(&Interner),
diff --git a/crates/hir_ty/src/tests/simple.rs b/crates/hir_ty/src/tests/simple.rs
index 19775a4ec..79445a12d 100644
--- a/crates/hir_ty/src/tests/simple.rs
+++ b/crates/hir_ty/src/tests/simple.rs
@@ -496,7 +496,7 @@ fn infer_literals() {
             26..30 '5f32': f32
             36..40 '5f64': f64
             46..53 '"hello"': &str
-            59..67 'b"bytes"': &[u8; _]
+            59..67 'b"bytes"': &[u8; 5]
             73..76 ''c'': char
             82..86 'b'b'': u8
             92..96 '3.14': f64
@@ -504,7 +504,7 @@ fn infer_literals() {
             112..117 'false': bool
             123..127 'true': bool
             133..197 'r#"   ...    "#': &str
-            203..213 'br#"yolo"#': &[u8; _]
+            203..213 'br#"yolo"#': &[u8; 4]
         "##]],
     );
 }
-- 
cgit v1.2.3