Auto merge of #97035 - JohnTitor:rollup-00ko07z, r=JohnTitor
Rollup of 6 pull requests Successful merges: - #95365 (Use default alloc_error_handler for hermit) - #96986 ([save-analysis] Reference the variant not enum at struct-literal cons…) - #96998 (rustdoc: remove weird, unused variable from source-files.js) - #97005 (Two small improvements of rustc_expand) - #97018 (Ensure that test fail if a JS error occurs) - #97031 (Drop tracking: handle invalid assignments better) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
c31879922e
10 changed files with 52 additions and 12 deletions
|
|
@ -1 +1 @@
|
|||
0.9.0
|
||||
0.9.1
|
||||
|
|
@ -417,7 +417,7 @@ pub(super) fn write_shared(
|
|||
));
|
||||
all_sources.sort();
|
||||
Ok(format!(
|
||||
"var N = null;var sourcesIndex = {{}};\n{}\ncreateSourceSidebar();\n",
|
||||
"var sourcesIndex = {{}};\n{}\ncreateSourceSidebar();\n",
|
||||
all_sources.join("\n")
|
||||
)
|
||||
.into_bytes())
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
// edition:2018
|
||||
// compile-flags: -Zdrop-tracking
|
||||
// Regression test for issue #73741
|
||||
// Ensures that we don't emit spurious errors when
|
||||
// a type error ocurrs in an `async fn`
|
||||
|
||||
async fn weird() {
|
||||
1 = 2; //~ ERROR invalid left-hand side
|
||||
|
||||
let mut loop_count = 0;
|
||||
async {}.await
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
error[E0070]: invalid left-hand side of assignment
|
||||
--> $DIR/issue-73741-type-err-drop-tracking.rs:8:7
|
||||
|
|
||||
LL | 1 = 2;
|
||||
| - ^
|
||||
| |
|
||||
| cannot assign to this expression
|
||||
|
||||
error: aborting due to previous error
|
||||
|
||||
For more information about this error, try `rustc --explain E0070`.
|
||||
|
|
@ -138,7 +138,7 @@ async function main(argv) {
|
|||
try {
|
||||
// This is more convenient that setting fields one by one.
|
||||
let args = [
|
||||
"--variable", "DOC_PATH", opts["doc_folder"],
|
||||
"--variable", "DOC_PATH", opts["doc_folder"], "--enable-fail-on-js-error",
|
||||
];
|
||||
if (opts["debug"]) {
|
||||
debug = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue