Skip to content

Commit

Permalink
Auto merge of rust-lang#5097 - phansch:remove_fixme, r=llogiq
Browse files Browse the repository at this point in the history
Resolve FIXME: String::new is now a const fn

`const_string_new` is stable since Rust 1.39

changelog: none
  • Loading branch information
bors committed Jan 26, 2020
2 parents b6a9766 + 4533310 commit fa046d2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions tests/ui/missing_const_for_fn/could_be_const.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ fn two() -> i32 {
abc
}

// FIXME: This is a false positive in the `is_min_const_fn` function.
// At least until the `const_string_new` feature is stabilzed.
// Could be const (since Rust 1.39)
fn string() -> String {
String::new()
}
Expand Down
10 changes: 5 additions & 5 deletions tests/ui/missing_const_for_fn/could_be_const.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -26,39 +26,39 @@ LL | | }
| |_^

error: this could be a `const fn`
--> $DIR/could_be_const.rs:30:1
--> $DIR/could_be_const.rs:29:1
|
LL | / fn string() -> String {
LL | | String::new()
LL | | }
| |_^

error: this could be a `const fn`
--> $DIR/could_be_const.rs:35:1
--> $DIR/could_be_const.rs:34:1
|
LL | / unsafe fn four() -> i32 {
LL | | 4
LL | | }
| |_^

error: this could be a `const fn`
--> $DIR/could_be_const.rs:40:1
--> $DIR/could_be_const.rs:39:1
|
LL | / fn generic<T>(t: T) -> T {
LL | | t
LL | | }
| |_^

error: this could be a `const fn`
--> $DIR/could_be_const.rs:44:1
--> $DIR/could_be_const.rs:43:1
|
LL | / fn sub(x: u32) -> usize {
LL | | unsafe { transmute(&x) }
LL | | }
| |_^

error: this could be a `const fn`
--> $DIR/could_be_const.rs:63:9
--> $DIR/could_be_const.rs:62:9
|
LL | / pub fn b(self, a: &A) -> B {
LL | | B
Expand Down

0 comments on commit fa046d2

Please sign in to comment.