Auto merge of #52802 - kennytm:rollup, r=kennytm
Rollup of 11 pull requests Successful merges: - #52702 (Suggest fix when encountering different mutability from impl to trait) - #52703 (Improve a few vectors - calculate capacity or build from iterators) - #52740 (Suggest underscore when using dashes in crate namet push fork) - #52759 (Impl Send & Sync for JoinHandle) - #52760 (rustc_metadata: test loading atoi instead of cos) - #52763 (Omit the vendor component in Fuchsia triple) - #52765 (Remove unused "-Zenable_nonzeroing_move_hints" flag) - #52769 (Incorporate a stray test) - #52777 (Fix doc comment for 'ptr::copy_to' method) - #52779 (revert accidental atty downgrade) - #52781 (Use a slice where a vector is not necessary) Failed merges: r? @ghost
This commit is contained in:
commit
cc224282de
43 changed files with 185 additions and 113 deletions
15
src/test/ui/bad-crate-name.rs
Normal file
15
src/test/ui/bad-crate-name.rs
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
extern crate krate-name-here;
|
||||
//~^ ERROR crate name using dashes are not valid in `extern crate` statements
|
||||
//~| ERROR can't find crate for `krate_name_here`
|
||||
|
||||
fn main() {}
|
||||
19
src/test/ui/bad-crate-name.stderr
Normal file
19
src/test/ui/bad-crate-name.stderr
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
error: crate name using dashes are not valid in `extern crate` statements
|
||||
--> $DIR/bad-crate-name.rs:11:14
|
||||
|
|
||||
LL | extern crate krate-name-here;
|
||||
| ^^^^^^^^^^^^^^^ dash-separated idents are not valid
|
||||
help: if the original crate name uses dashes you need to use underscores in the code
|
||||
|
|
||||
LL | extern crate krate_name_here;
|
||||
| ^ ^
|
||||
|
||||
error[E0463]: can't find crate for `krate_name_here`
|
||||
--> $DIR/bad-crate-name.rs:11:1
|
||||
|
|
||||
LL | extern crate krate-name-here;
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
For more information about this error, try `rustc --explain E0463`.
|
||||
|
|
@ -9,6 +9,10 @@ LL | fn bar(&mut self, other: &Foo) {}
|
|||
|
|
||||
= note: expected type `fn(&mut Baz, &mut dyn Foo)`
|
||||
found type `fn(&mut Baz, &dyn Foo)`
|
||||
help: consider change the type to match the mutability in trait
|
||||
|
|
||||
LL | fn bar(&mut self, other: &mut Foo) {}
|
||||
| ^^^^^^^^
|
||||
|
||||
error: aborting due to previous error
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,10 @@ LL | fn bar(&mut self) { }
|
|||
|
|
||||
= note: expected type `fn(&Bar)`
|
||||
found type `fn(&mut Bar)`
|
||||
help: consider change the type to match the mutability in trait
|
||||
|
|
||||
LL | fn bar(&self) { }
|
||||
| ^^^^^
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,10 @@ LL | fn bar(&mut self, bar: &Bar) { } //~ ERROR incompatible type
|
|||
|
|
||||
= note: expected type `fn(&mut Bar, &mut Bar)`
|
||||
found type `fn(&mut Bar, &Bar)`
|
||||
help: consider change the type to match the mutability in trait
|
||||
|
|
||||
LL | fn bar(&mut self, bar: &mut Bar) { } //~ ERROR incompatible type
|
||||
| ^^^^^^^^
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue