diff options
| author | Caleb Cartwright <calebcartwright@users.noreply.github.com> | 2022-06-22 20:57:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-22 20:57:46 -0500 |
| commit | 224f1c938fb606c063e5b9b7817c51bbdeb6dbca (patch) | |
| tree | 9459e49c6e0c790e03798e54885e1dff1533b3d8 | |
| parent | 08105e80b7c48782cfd7acbf3695c7f14c839cfd (diff) | |
| parent | dc2d86dec3c55b63ab80d193fb6139a6762b2012 (diff) | |
| download | rust-224f1c938fb606c063e5b9b7817c51bbdeb6dbca.tar.gz rust-224f1c938fb606c063e5b9b7817c51bbdeb6dbca.zip | |
Merge pull request #5405 from calebcartwright/subtree-sync-2022-06-22
Subtree sync 2022 06 22
| -rw-r--r-- | rust-toolchain | 2 | ||||
| -rw-r--r-- | src/parse/session.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/rust-toolchain b/rust-toolchain index 813e5e2c10f..2640a9e0ecc 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2022-06-06" +channel = "nightly-2022-06-21" components = ["rustc-dev"] diff --git a/src/parse/session.rs b/src/parse/session.rs index a0f71c2b8ba..23db5421910 100644 --- a/src/parse/session.rs +++ b/src/parse/session.rs @@ -433,7 +433,7 @@ mod tests { Some(ignore_list), ); let span = MultiSpan::from_span(mk_sp(BytePos(0), BytePos(1))); - let non_fatal_diagnostic = build_diagnostic(DiagnosticLevel::Warning, Some(span)); + let non_fatal_diagnostic = build_diagnostic(DiagnosticLevel::Warning(None), Some(span)); emitter.emit_diagnostic(&non_fatal_diagnostic); assert_eq!(num_emitted_errors.load(Ordering::Acquire), 0); assert_eq!(can_reset_errors.load(Ordering::Acquire), true); @@ -457,7 +457,7 @@ mod tests { None, ); let span = MultiSpan::from_span(mk_sp(BytePos(0), BytePos(1))); - let non_fatal_diagnostic = build_diagnostic(DiagnosticLevel::Warning, Some(span)); + let non_fatal_diagnostic = build_diagnostic(DiagnosticLevel::Warning(None), Some(span)); emitter.emit_diagnostic(&non_fatal_diagnostic); assert_eq!(num_emitted_errors.load(Ordering::Acquire), 1); assert_eq!(can_reset_errors.load(Ordering::Acquire), false); @@ -494,8 +494,8 @@ mod tests { ); let bar_span = MultiSpan::from_span(mk_sp(BytePos(0), BytePos(1))); let foo_span = MultiSpan::from_span(mk_sp(BytePos(21), BytePos(22))); - let bar_diagnostic = build_diagnostic(DiagnosticLevel::Warning, Some(bar_span)); - let foo_diagnostic = build_diagnostic(DiagnosticLevel::Warning, Some(foo_span)); + let bar_diagnostic = build_diagnostic(DiagnosticLevel::Warning(None), Some(bar_span)); + let foo_diagnostic = build_diagnostic(DiagnosticLevel::Warning(None), Some(foo_span)); let fatal_diagnostic = build_diagnostic(DiagnosticLevel::Fatal, None); emitter.emit_diagnostic(&bar_diagnostic); emitter.emit_diagnostic(&foo_diagnostic); |