From 416caa10ed055e8f059bb2fe3d3dd67c063dfe6c Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sun, 4 Aug 2019 20:20:12 +0900 Subject: [PATCH 01/11] Add test for issue-29265 --- src/test/ui/issues/auxiliary/issue-29265.rs | 9 +++++++++ src/test/ui/issues/issue-29265.rs | 10 ++++++++++ 2 files changed, 19 insertions(+) create mode 100644 src/test/ui/issues/auxiliary/issue-29265.rs create mode 100644 src/test/ui/issues/issue-29265.rs diff --git a/src/test/ui/issues/auxiliary/issue-29265.rs b/src/test/ui/issues/auxiliary/issue-29265.rs new file mode 100644 index 00000000000..6d26002a2e7 --- /dev/null +++ b/src/test/ui/issues/auxiliary/issue-29265.rs @@ -0,0 +1,9 @@ +#![crate_type = "lib"] + +pub struct SomeType { + pub some_member: usize, +} + +pub static SOME_VALUE: SomeType = SomeType { + some_member: 1, +}; diff --git a/src/test/ui/issues/issue-29265.rs b/src/test/ui/issues/issue-29265.rs new file mode 100644 index 00000000000..f554c4d16c7 --- /dev/null +++ b/src/test/ui/issues/issue-29265.rs @@ -0,0 +1,10 @@ +// aux-build:issue-29265.rs +// check-pass + +extern crate issue_29265 as lib; + +static _UNUSED: &'static lib::SomeType = &lib::SOME_VALUE; + +fn main() { + vec![0u8; lib::SOME_VALUE.some_member]; +} From 620567d87ed578587cbbc6bad851576507283544 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sun, 4 Aug 2019 20:20:40 +0900 Subject: [PATCH 02/11] Add test for issue-49544 --- src/test/ui/issues/auxiliary/issue-49544.rs | 7 +++++++ src/test/ui/issues/issue-49544.rs | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/test/ui/issues/auxiliary/issue-49544.rs create mode 100644 src/test/ui/issues/issue-49544.rs diff --git a/src/test/ui/issues/auxiliary/issue-49544.rs b/src/test/ui/issues/auxiliary/issue-49544.rs new file mode 100644 index 00000000000..f8b3a3fba1e --- /dev/null +++ b/src/test/ui/issues/auxiliary/issue-49544.rs @@ -0,0 +1,7 @@ +#![crate_type = "lib"] + +pub fn foo() -> Vec { + std::env::args() + .skip(1) + .collect() +} diff --git a/src/test/ui/issues/issue-49544.rs b/src/test/ui/issues/issue-49544.rs new file mode 100644 index 00000000000..ed356275fc1 --- /dev/null +++ b/src/test/ui/issues/issue-49544.rs @@ -0,0 +1,9 @@ +// aux-build:issue-49544.rs +// check-pass + +extern crate issue_49544; +use issue_49544::foo; + +fn main() { + let _ = foo(); +} From 92e4e8e7836e5a505dc466039135b75252e5b1f6 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sun, 4 Aug 2019 21:22:42 +0900 Subject: [PATCH 03/11] Add test for issue-37433 --- src/test/ui/issues/issue-37433.rs | 8 ++++++++ src/test/ui/issues/issue-37433.stderr | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/test/ui/issues/issue-37433.rs create mode 100644 src/test/ui/issues/issue-37433.stderr diff --git a/src/test/ui/issues/issue-37433.rs b/src/test/ui/issues/issue-37433.rs new file mode 100644 index 00000000000..784e6ccdac0 --- /dev/null +++ b/src/test/ui/issues/issue-37433.rs @@ -0,0 +1,8 @@ +#![feature(asm)] + +fn main() { + unsafe { + asm!("" :: "r"("")); + //~^ ERROR: invalid value for constraint in inline assembly + } +} diff --git a/src/test/ui/issues/issue-37433.stderr b/src/test/ui/issues/issue-37433.stderr new file mode 100644 index 00000000000..af641933301 --- /dev/null +++ b/src/test/ui/issues/issue-37433.stderr @@ -0,0 +1,8 @@ +error[E0669]: invalid value for constraint in inline assembly + --> $DIR/issue-37433.rs:5:24 + | +LL | asm!("" :: "r"("")); + | ^^ + +error: aborting due to previous error + From ebc36001c0b23689839e6a11c493f8c261d344da Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Fri, 26 Jul 2019 00:20:28 +0200 Subject: [PATCH 04/11] Add test for #43398 Closes #43398 --- src/test/ui/issues/issue-43398.rs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/test/ui/issues/issue-43398.rs diff --git a/src/test/ui/issues/issue-43398.rs b/src/test/ui/issues/issue-43398.rs new file mode 100644 index 00000000000..ae52e8f3f6b --- /dev/null +++ b/src/test/ui/issues/issue-43398.rs @@ -0,0 +1,15 @@ +// run-pass + +#![feature(core_intrinsics)] +#![feature(repr128)] + +#[repr(i128)] +enum Big { A, B } + +fn main() { + unsafe { + println!("{} {:?}", + std::intrinsics::discriminant_value(&Big::A), + std::mem::discriminant(&Big::B)); + } +} From 418bf968f07f4d099a7536bd5f6ce0cb90709820 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Tue, 6 Aug 2019 20:05:22 +0900 Subject: [PATCH 05/11] Ignore no support targets --- src/test/ui/issues/issue-37433.rs | 2 ++ src/test/ui/issues/issue-37433.stderr | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/ui/issues/issue-37433.rs b/src/test/ui/issues/issue-37433.rs index 784e6ccdac0..d3663e24e60 100644 --- a/src/test/ui/issues/issue-37433.rs +++ b/src/test/ui/issues/issue-37433.rs @@ -1,3 +1,5 @@ +// ignore-emscripten no asm! support + #![feature(asm)] fn main() { diff --git a/src/test/ui/issues/issue-37433.stderr b/src/test/ui/issues/issue-37433.stderr index af641933301..eec04469025 100644 --- a/src/test/ui/issues/issue-37433.stderr +++ b/src/test/ui/issues/issue-37433.stderr @@ -1,5 +1,5 @@ error[E0669]: invalid value for constraint in inline assembly - --> $DIR/issue-37433.rs:5:24 + --> $DIR/issue-37433.rs:7:24 | LL | asm!("" :: "r"("")); | ^^ From 031cc323f5a0aded283977a38e90bab9bfd21357 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Tue, 6 Aug 2019 13:32:08 +0000 Subject: [PATCH 06/11] doc: Reword deprecation message of MetadataExt::as_raw_stat --- src/libstd/os/linux/fs.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libstd/os/linux/fs.rs b/src/libstd/os/linux/fs.rs index ec5e9837076..78321ac3185 100644 --- a/src/libstd/os/linux/fs.rs +++ b/src/libstd/os/linux/fs.rs @@ -34,9 +34,10 @@ pub trait MetadataExt { /// } /// ``` #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated(since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait")] + #[rustc_deprecated( + since = "1.8.0", + reason = "other methods of this trait are now prefered" + )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; From 70374c95f9f0a723f2560b8c8aee3b94d99ac36b Mon Sep 17 00:00:00 2001 From: Mark Mansi Date: Tue, 6 Aug 2019 13:53:51 -0500 Subject: [PATCH 07/11] update to rustc-guide that passes toolstate --- src/doc/rustc-guide | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/rustc-guide b/src/doc/rustc-guide index b5a2b9353c6..07dbcdec188 160000 --- a/src/doc/rustc-guide +++ b/src/doc/rustc-guide @@ -1 +1 @@ -Subproject commit b5a2b9353c661000378415ecfeb757eb7df42d66 +Subproject commit 07dbcdec1888b2a5e9e78f4828c52417c49e0398 From a411eaf0c85624be11209ee2f96aae3db5eafda9 Mon Sep 17 00:00:00 2001 From: Mark Mansi Date: Tue, 6 Aug 2019 17:19:01 -0500 Subject: [PATCH 08/11] passify tidy --- src/doc/rustc-guide | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/rustc-guide b/src/doc/rustc-guide index 07dbcdec188..6f4ba673ff9 160000 --- a/src/doc/rustc-guide +++ b/src/doc/rustc-guide @@ -1 +1 @@ -Subproject commit 07dbcdec1888b2a5e9e78f4828c52417c49e0398 +Subproject commit 6f4ba673ff9d4613e98415bc095347a6a0031e9c From 811c3040299beb2cc90dc143b90af32dc78b0a3a Mon Sep 17 00:00:00 2001 From: Ryan Gorup Date: Tue, 6 Aug 2019 09:54:30 -0700 Subject: [PATCH 09/11] Test conditional initialization validation in async fns --- ...onditional-and-guaranteed-initialization.rs | 18 ++++++++++++++++++ .../no-non-guaranteed-initialization.rs | 16 ++++++++++++++++ .../no-non-guaranteed-initialization.stderr | 9 +++++++++ 3 files changed, 43 insertions(+) create mode 100644 src/test/ui/async-await/conditional-and-guaranteed-initialization.rs create mode 100644 src/test/ui/async-await/no-non-guaranteed-initialization.rs create mode 100644 src/test/ui/async-await/no-non-guaranteed-initialization.stderr diff --git a/src/test/ui/async-await/conditional-and-guaranteed-initialization.rs b/src/test/ui/async-await/conditional-and-guaranteed-initialization.rs new file mode 100644 index 00000000000..a5947e7f718 --- /dev/null +++ b/src/test/ui/async-await/conditional-and-guaranteed-initialization.rs @@ -0,0 +1,18 @@ +// check-pass +// edition:2018 +// compile-flags: --crate-type lib + +#![feature(async_await)] + +async fn conditional_and_guaranteed_initialization(x: usize) -> usize { + let y; + if x > 5 { + y = echo(10).await; + } else { + y = get_something().await; + } + y +} + +async fn echo(x: usize) -> usize { x } +async fn get_something() -> usize { 10 } diff --git a/src/test/ui/async-await/no-non-guaranteed-initialization.rs b/src/test/ui/async-await/no-non-guaranteed-initialization.rs new file mode 100644 index 00000000000..a916afb6b09 --- /dev/null +++ b/src/test/ui/async-await/no-non-guaranteed-initialization.rs @@ -0,0 +1,16 @@ +// compile-fail +// edition:2018 +// compile-flags: --crate-type lib + +#![feature(async_await)] + +async fn no_non_guaranteed_initialization(x: usize) -> usize { + let y; + if x > 5 { + y = echo(10).await; + } + y + //~^ use of possibly uninitialized variable: `y` +} + +async fn echo(x: usize) -> usize { x + 1 } diff --git a/src/test/ui/async-await/no-non-guaranteed-initialization.stderr b/src/test/ui/async-await/no-non-guaranteed-initialization.stderr new file mode 100644 index 00000000000..fb94522cac0 --- /dev/null +++ b/src/test/ui/async-await/no-non-guaranteed-initialization.stderr @@ -0,0 +1,9 @@ +error[E0381]: use of possibly uninitialized variable: `y` + --> $DIR/no-non-guaranteed-initialization.rs:12:5 + | +LL | y + | ^ use of possibly uninitialized `y` + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0381`. From 7568fbd7fab458db7a17726a10e18a54514d11ea Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Wed, 7 Aug 2019 09:44:12 -0700 Subject: [PATCH 10/11] Update books --- src/doc/edition-guide | 2 +- src/doc/embedded-book | 2 +- src/doc/nomicon | 2 +- src/doc/reference | 2 +- src/doc/rust-by-example | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/doc/edition-guide b/src/doc/edition-guide index f6c8b92d4e6..e58bc4ca104 160000 --- a/src/doc/edition-guide +++ b/src/doc/edition-guide @@ -1 +1 @@ -Subproject commit f6c8b92d4e63edd28e862be952f33861f35956f8 +Subproject commit e58bc4ca104e890ac56af846877c874c432a64b5 diff --git a/src/doc/embedded-book b/src/doc/embedded-book index ff334e74fdb..c5da1e11915 160000 --- a/src/doc/embedded-book +++ b/src/doc/embedded-book @@ -1 +1 @@ -Subproject commit ff334e74fdb9f197e621efa6d7c3105be892e888 +Subproject commit c5da1e11915d3f28266168baaf55822f7e3fe999 diff --git a/src/doc/nomicon b/src/doc/nomicon index b7f0aba2f88..8a7d05615e5 160000 --- a/src/doc/nomicon +++ b/src/doc/nomicon @@ -1 +1 @@ -Subproject commit b7f0aba2f88a8feade70595efcfa3438e54e96c0 +Subproject commit 8a7d05615e5bc0a7fb961b4919c44f5221ee54da diff --git a/src/doc/reference b/src/doc/reference index 8e7d614303b..b4b35368390 160000 --- a/src/doc/reference +++ b/src/doc/reference @@ -1 +1 @@ -Subproject commit 8e7d614303b0dec7492e048e63855fcd3b944ec8 +Subproject commit b4b3536839042a6743fc76f0d9ad2a812020aeaa diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example index e3679e214d8..f2c15ba5ee8 160000 --- a/src/doc/rust-by-example +++ b/src/doc/rust-by-example @@ -1 +1 @@ -Subproject commit e3679e214d8db44586aca9b20aa27517007d1923 +Subproject commit f2c15ba5ee89ae9469a2cf60494977749901d764 From c03077b23accd0a5b074e298538bb0557b0be9da Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 7 Aug 2019 14:51:49 -0700 Subject: [PATCH 11/11] Use consistent capitalization in -C/-Z help --- src/librustc/session/config.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index 748d2a48249..3536b2aa8ff 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -1155,7 +1155,7 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options, passes: Vec = (Vec::new(), parse_list, [TRACKED], "a list of extra LLVM passes to run (space separated)"), llvm_args: Vec = (Vec::new(), parse_list, [TRACKED], - "a list of arguments to pass to llvm (space separated)"), + "a list of arguments to pass to LLVM (space separated)"), save_temps: bool = (false, parse_bool, [UNTRACKED], "save all temporary output files during compilation"), rpath: bool = (false, parse_bool, [UNTRACKED], @@ -1208,7 +1208,7 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options, default_linker_libraries: Option = (None, parse_opt_bool, [UNTRACKED], "allow the linker to link its default libraries"), linker_flavor: Option = (None, parse_linker_flavor, [UNTRACKED], - "Linker flavor"), + "linker flavor"), linker_plugin_lto: LinkerPluginLto = (LinkerPluginLto::Disabled, parse_linker_plugin_lto, [TRACKED], "generate build artifacts that are compatible with linker-based LTO."), @@ -1255,7 +1255,7 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options, print_link_args: bool = (false, parse_bool, [UNTRACKED], "print the arguments passed to the linker"), print_llvm_passes: bool = (false, parse_bool, [UNTRACKED], - "prints the llvm optimization passes being run"), + "prints the LLVM optimization passes being run"), ast_json: bool = (false, parse_bool, [UNTRACKED], "print the AST as JSON and halt"), threads: Option = (None, parse_opt_uint, [UNTRACKED], @@ -1375,11 +1375,11 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options, osx_rpath_install_name: bool = (false, parse_bool, [TRACKED], "pass `-install_name @rpath/...` to the macOS linker"), sanitizer: Option = (None, parse_sanitizer, [TRACKED], - "Use a sanitizer"), + "use a sanitizer"), fuel: Option<(String, u64)> = (None, parse_optimization_fuel, [TRACKED], "set the optimization fuel quota for a crate"), print_fuel: Option = (None, parse_opt_string, [TRACKED], - "make Rustc print the total optimization fuel used by a crate"), + "make rustc print the total optimization fuel used by a crate"), force_unstable_if_unmarked: bool = (false, parse_bool, [TRACKED], "force all crates to be `rustc_private` unstable"), pre_link_arg: Vec = (vec![], parse_string_push, [UNTRACKED], @@ -1417,7 +1417,7 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options, "in dep-info output, omit targets for tracking dependencies of the dep-info files \ themselves"), unpretty: Option = (None, parse_unpretty, [UNTRACKED], - "Present the input source, unstable (and less-pretty) variants; + "present the input source, unstable (and less-pretty) variants; valid types are any of the types for `--pretty`, as well as: `expanded`, `expanded,identified`, `expanded,hygiene` (with internal representations),