diff options
| author | codehorseman <cricis@yeah.net> | 2022-03-16 20:12:30 +0800 |
|---|---|---|
| committer | codehorseman <cricis@yeah.net> | 2022-03-16 20:12:30 +0800 |
| commit | 01dbfb3eb264135c432cef223848416f90dac290 (patch) | |
| tree | 67e0a6d5e9a26aa88fe06b38651fe030d994f508 /compiler/rustc_mir_build | |
| parent | d8e564715e0eb17130e99e8fcc92a36fce7feaf5 (diff) | |
| download | rust-01dbfb3eb264135c432cef223848416f90dac290.tar.gz rust-01dbfb3eb264135c432cef223848416f90dac290.zip | |
resolve the conflict in compiler/rustc_session/src/parse.rs
Signed-off-by: codehorseman <cricis@yeah.net>
Diffstat (limited to 'compiler/rustc_mir_build')
| -rw-r--r-- | compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs b/compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs index ae9b44cee4b..b4de32a3bd9 100644 --- a/compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs +++ b/compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs @@ -523,7 +523,7 @@ impl<'a, 'tcx> ConstToPat<'a, 'tcx> { ty::RawPtr(pointee) if pointee.ty.is_sized(tcx.at(span), param_env) => { PatKind::Constant { value: cv } } - // FIXME: these can have very suprising behaviour where optimization levels or other + // FIXME: these can have very surprising behaviour where optimization levels or other // compilation choices change the runtime behaviour of the match. // See https://github.com/rust-lang/rust/issues/70861 for examples. ty::FnPtr(..) | ty::RawPtr(..) => { |