Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 7 pull requests #99506

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.

Sign up for GitHub

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

Merged
merged 17 commits into from
Jul 20, 2022
Merged

Rollup of 7 pull requests #99506

Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8374ab6
Don't add attribute to allow unused-qualifications to derive impl's
samrat May 7, 2020
7c900c9
Add flag to configure `noalias` on `Box<T>`
Noratrieb Jul 18, 2022
e8d9f38
Do not allow typeck children items to constrain outer RPITs
compiler-errors Jul 16, 2022
5a4601f
use opaque_ty_origin_unchecked instead of destructuring HIR
compiler-errors Jul 17, 2022
3511856
remove a type string comparison in `check_str_addition`
TaKO8Ki Jul 19, 2022
43c0c63
Fix a numerical underflow in tuple wrap suggestion
compiler-errors Jul 19, 2022
05bb878
Remove #[allow(unused_qualifications)] lines from derive diff test
mdholloway Jul 19, 2022
439d64a
Library changes for Apple WatchOS
vladimir-ea Mar 23, 2022
7c0fb38
take opaq types
ouz-a Jul 2, 2022
64dc377
use def_id
ouz-a Jul 20, 2022
90c59e7
Rollup merge of #98101 - vladimir-ea:stdlib_watch_os, r=thomcc
Dylan-DPC Jul 20, 2022
3c3c5da
Rollup merge of #99345 - compiler-errors:issue-99073-redux, r=oli-obk
Dylan-DPC Jul 20, 2022
eecfdfb
Rollup merge of #99383 - ouz-a:issue_57961, r=oli-obk
Dylan-DPC Jul 20, 2022
fffc650
Rollup merge of #99436 - Nilstrieb:toggle-box-noalias, r=fee1-dead
Dylan-DPC Jul 20, 2022
d9a71c1
Rollup merge of #99483 - compiler-errors:issue-99482, r=jyn514
Dylan-DPC Jul 20, 2022
3257c34
Rollup merge of #99485 - mdholloway:unused-qualifications-in-derive, …
Dylan-DPC Jul 20, 2022
17a2832
Rollup merge of #99486 - TaKO8Ki:remove-type-string-comparison-in-che…
Dylan-DPC Jul 20, 2022
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
17 changes: 9 additions & 8 deletions compiler/rustc_typeck/src/check/op.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,18 +630,19 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let rm_borrow_msg = "remove the borrow to obtain an owned `String`";
let to_owned_msg = "create an owned `String` from a string reference";

let string_type = self.tcx.get_diagnostic_item(sym::String);
let is_std_string = |ty: Ty<'tcx>| match ty.ty_adt_def() {
Some(ty_def) => Some(ty_def.did()) == string_type,
None => false,
let is_std_string = |ty: Ty<'tcx>| {
ty.ty_adt_def()
.map_or(false, |ty_def| self.tcx.is_diagnostic_item(sym::String, ty_def.did()))
};

match (lhs_ty.kind(), rhs_ty.kind()) {
(&Ref(_, l_ty, _), &Ref(_, r_ty, _)) // &str or &String + &str, &String or &&str
if (*l_ty.kind() == Str || is_std_string(l_ty)) && (
*r_ty.kind() == Str || is_std_string(r_ty) ||
&format!("{:?}", rhs_ty) == "&&str"
) =>
if (*l_ty.kind() == Str || is_std_string(l_ty))
&& (*r_ty.kind() == Str
|| is_std_string(r_ty)
|| matches!(
r_ty.kind(), Ref(_, inner_ty, _) if *inner_ty.kind() == Str
)) =>
{
if let IsAssign::No = is_assign { // Do not supply this message if `&str += &str`
err.span_label(op.span, "`+` cannot be used to concatenate two `&str` strings");
Expand Down