Update Cargo.lock and remove duplicated impl

GuillaumeGomez · GuillaumeGomez · commit 541b32c8abff · 2024-07-10T13:02:26.000+02:00
diff --git a/compiler/rustc_codegen_gcc/Cargo.lock b/compiler/rustc_codegen_gcc/Cargo.lock
@@ -79,16 +79,18 @@ dependencies = [
 
 [[package]]
 name = "gccjit"
-version = "2.0.0"
-source = "git+https://github.com/rust-lang/gccjit.rs#328cb1b414f67dfa15162ba7a55ed01931f1b219"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62e0ba949ebee07c5cc21f02cb48f28f2c8db7fcbc15fdc5120476a6c43b4636"
 dependencies = [
  "gccjit_sys",
 ]
 
 [[package]]
 name = "gccjit_sys"
-version = "0.1.0"
-source = "git+https://github.com/rust-lang/gccjit.rs#328cb1b414f67dfa15162ba7a55ed01931f1b219"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5bbf85e12c2593772329a9d4e8310271f6706e6045ce4f41b041dd34fba6603"
 dependencies = [
  "libc",
 ]
diff --git a/compiler/rustc_codegen_gcc/src/builder.rs b/compiler/rustc_codegen_gcc/src/builder.rs
@@ -2369,12 +2369,6 @@ impl<'tcx> HasWasmCAbiOpt for Builder<'_, '_, 'tcx> {
     }
 }
 
-impl<'tcx> HasWasmCAbiOpt for Builder<'_, '_, 'tcx> {
-    fn wasm_c_abi_opt(&self) -> WasmCAbi {
-        self.cx.wasm_c_abi_opt()
-    }
-}
-
 pub trait ToGccComp {
     fn to_gcc_comparison(&self) -> ComparisonOp;
 }

Original file line number	Diff line number	Diff line change
`@@ -2369,12 +2369,6 @@ impl<'tcx> HasWasmCAbiOpt for Builder<'_, '_, 'tcx> {`
`2369`	`2369`	`}`
`2370`	`2370`	`}`
`2371`	`2371`
`2372`		`-impl<'tcx> HasWasmCAbiOpt for Builder<'_, '_, 'tcx> {`
`2373`		`- fn wasm_c_abi_opt(&self) -> WasmCAbi {`
`2374`		`- self.cx.wasm_c_abi_opt()`
`2375`		`- }`
`2376`		`-}`
`2377`		`-`
`2378`	`2372`	`pub trait ToGccComp {`
`2379`	`2373`	`fn to_gcc_comparison(&self) -> ComparisonOp;`
`2380`	`2374`	`}`