diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2023-02-12 16:37:19 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2023-02-12 16:37:19 +0100 |
| commit | ebecfbd3519a1ee93083b46daaa57e4d666e46de (patch) | |
| tree | add6cdeb46ce083a323f720ac1821d302e0e0ca9 /gcc/rust/rust-lang.cc | |
| parent | d4d6d573b4a232519992123ae35740b0e5fa03da (diff) | |
| parent | 83ffe9cde7fe0b4deb0d1b54175fd9b19c38179c (diff) | |
| download | gcc-ebecfbd3519a1ee93083b46daaa57e4d666e46de.zip gcc-ebecfbd3519a1ee93083b46daaa57e4d666e46de.tar.gz gcc-ebecfbd3519a1ee93083b46daaa57e4d666e46de.tar.bz2 | |
Merge commit '83ffe9cde7fe0b4deb0d1b54175fd9b19c38179c' into HEAD
Conflicts:
gcc/rust/rust-gcc-diagnostics.cc
gcc/rust/typecheck/rust-hir-trait-ref.h
gcc/rust/typecheck/rust-hir-type-check-toplevel.cc
gcc/rust/typecheck/rust-hir-type-check-toplevel.h
gcc/rust/typecheck/rust-tyctx.cc
gcc/rust/typecheck/rust-tyty-rules.h
Upstream GCC commit r13-5197-g83ffe9cde7fe0b4deb0d1b54175fd9b19c38179c
"Update copyright years" did updated those files that don't exist in
GCC/Rust master branch anymore.
Diffstat (limited to 'gcc/rust/rust-lang.cc')
| -rw-r--r-- | gcc/rust/rust-lang.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/rust/rust-lang.cc b/gcc/rust/rust-lang.cc index d69f283..963b112 100644 --- a/gcc/rust/rust-lang.cc +++ b/gcc/rust/rust-lang.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2020-2022 Free Software Foundation, Inc. +// Copyright (C) 2020-2023 Free Software Foundation, Inc. // This file is part of GCC. |