Add str.as_str() for easy dereferencing of Box<str>

This commit is contained in:
Kornel 2024-08-25 11:20:42 +01:00
parent b0af276da3
commit 3dcb5a3962
No known key found for this signature in database
6 changed files with 17 additions and 62 deletions

View File

@ -1721,20 +1721,7 @@ fn report_no_match_method_error(
}
}
if item_name.name == sym::as_str && rcvr_ty.peel_refs().is_str() {
let msg = "remove this method call";
let mut fallback_span = true;
if let SelfSource::MethodCall(expr) = source {
let call_expr = self.tcx.hir().expect_expr(self.tcx.parent_hir_id(expr.hir_id));
if let Some(span) = call_expr.span.trim_start(expr.span) {
err.span_suggestion(span, msg, "", Applicability::MachineApplicable);
fallback_span = false;
}
}
if fallback_span {
err.span_label(span, msg);
}
} else if let Some(similar_candidate) = similar_candidate {
if let Some(similar_candidate) = similar_candidate {
// Don't emit a suggestion if we found an actual method
// that had unsatisfied trait bounds
if unsatisfied_predicates.is_empty()

View File

@ -93,6 +93,7 @@
// tidy-alphabetical-start
#![cfg_attr(not(no_global_oom_handling), feature(const_alloc_error))]
#![cfg_attr(not(no_global_oom_handling), feature(const_btree_len))]
#![cfg_attr(test, feature(str_as_str))]
#![feature(alloc_layout_extra)]
#![feature(allocator_api)]
#![feature(array_chunks)]

View File

@ -448,7 +448,11 @@ fn test_from_box_str() {
use std::string::String;
let s = String::from("foo").into_boxed_str();
assert_eq!((&&&s).as_str(), "foo");
let r: Rc<str> = Rc::from(s);
assert_eq!((&r).as_str(), "foo");
assert_eq!(r.as_str(), "foo");
assert_eq!(&r[..], "foo");
}

View File

@ -2737,6 +2737,17 @@ pub fn escape_unicode(&self) -> EscapeUnicode<'_> {
pub fn substr_range(&self, substr: &str) -> Option<Range<usize>> {
self.as_bytes().subslice_range(substr.as_bytes())
}
/// Returns the same string as a string slice `&str`.
///
/// This method is redundant when used directly on `&str`, but
/// it helps dereferencing other string-like types to string slices,
/// for example references to `Box<str>` or `Arc<str>`.
#[inline]
#[unstable(feature = "str_as_str", issue = "130366")]
pub fn as_str(&self) -> &str {
self
}
}
#[stable(feature = "rust1", since = "1.0.0")]

View File

@ -1,21 +0,0 @@
fn foo1(s: &str) {
s.as_str();
//~^ ERROR no method named `as_str` found
}
fn foo2<'a>(s: &'a str) {
s.as_str();
//~^ ERROR no method named `as_str` found
}
fn foo3(s: &mut str) {
s.as_str();
//~^ ERROR no method named `as_str` found
}
fn foo4(s: &&str) {
s.as_str();
//~^ ERROR no method named `as_str` found
}
fn main() {}

View File

@ -1,27 +0,0 @@
error[E0599]: no method named `as_str` found for reference `&str` in the current scope
--> $DIR/remove-as_str.rs:2:7
|
LL | s.as_str();
| -^^^^^^-- help: remove this method call
error[E0599]: no method named `as_str` found for reference `&'a str` in the current scope
--> $DIR/remove-as_str.rs:7:7
|
LL | s.as_str();
| -^^^^^^-- help: remove this method call
error[E0599]: no method named `as_str` found for mutable reference `&mut str` in the current scope
--> $DIR/remove-as_str.rs:12:7
|
LL | s.as_str();
| -^^^^^^-- help: remove this method call
error[E0599]: no method named `as_str` found for reference `&&str` in the current scope
--> $DIR/remove-as_str.rs:17:7
|
LL | s.as_str();
| -^^^^^^-- help: remove this method call
error: aborting due to 4 previous errors
For more information about this error, try `rustc --explain E0599`.