squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #4376

Browse source 
4376: Fix type of byte literals r=matklad a=flodiebold

They're `&[u8; N]`, not `&[u8]` (see #4374).

Co-authored-by: Florian Diebold <florian.diebold@freiheit.com>
This commit is contained in:
bors[bot] 2020-05-08 13:22:05 +00:00 committed by GitHub
commit d3eb9d8eaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_hir_ty/src/infer/expr.rs
View file

@ -501,8 +501,8 @@ impl<'a> InferenceContext<'a> {
}
Literal::ByteString(..) => {
let byte_type = Ty::simple(TypeCtor::Int(Uncertain::Known(IntTy::u8())));
let slice_type = Ty::apply_one(TypeCtor::Slice, byte_type);
Ty::apply_one(TypeCtor::Ref(Mutability::Shared), slice_type)
let array_type = Ty::apply_one(TypeCtor::Array, byte_type);
Ty::apply_one(TypeCtor::Ref(Mutability::Shared), array_type)
}
Literal::Char(..) => Ty::simple(TypeCtor::Char),
Literal::Int(_v, ty) => Ty::simple(TypeCtor::Int((*ty).into())),

13
crates/ra_hir_ty/src/tests/method_resolution.rs
View file

@ -17,8 +17,8 @@ impl<T> [T] {
#[lang = "slice_alloc"]
impl<T> [T] {}
fn test() {
<[_]>::foo(b"foo");
fn test(x: &[u8]) {
<[_]>::foo(x);
}
"#),
@r###"
@ -26,10 +26,11 @@ fn test() {
56..79 '{ ... }': T
66..73 'loop {}': !
71..73 '{}': ()
133..160 '{ ...o"); }': ()
139..149 '<[_]>::foo': fn foo<u8>(&[u8]) -> u8
139..157 '<[_]>:..."foo")': u8
150..156 'b"foo"': &[u8]
131..132 'x': &[u8]
141..163 '{ ...(x); }': ()
147..157 '<[_]>::foo': fn foo<u8>(&[u8]) -> u8
147..160 '<[_]>::foo(x)': u8
158..159 'x': &[u8]
"###
);
}

4
crates/ra_hir_ty/src/tests/simple.rs
View file

@ -414,7 +414,7 @@ fn test() {
27..31 '5f32': f32
37..41 '5f64': f64
47..54 '"hello"': &str
60..68 'b"bytes"': &[u8]
60..68 'b"bytes"': &[u8; _]
74..77 ''c'': char
83..87 'b'b'': u8
93..97 '3.14': f64
@ -422,7 +422,7 @@ fn test() {
113..118 'false': bool
124..128 'true': bool
134..202 'r#" ... "#': &str
208..218 'br#"yolo"#': &[u8]
208..218 'br#"yolo"#': &[u8; _]
"###
);
}