Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 8 pull requests #128673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Aug 5, 2024
Merged

Rollup of 8 pull requests #128673

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
468f935
std::thread: available_parallelism implementation for vxWorks proposal.
devnexen Jul 21, 2024
c2523c9
Use object in run-make/symbols-visibility
ChrisDenton Aug 3, 2024
36a8059
Remove unnecessary constants from flt2dec dragon
swenson Aug 3, 2024
f28d157
Update rmake.rs
ChrisDenton Aug 3, 2024
b94a9c1
Remove skipping symbols with the `__imp_` prefix
ChrisDenton Aug 3, 2024
f9d7e4c
Remove cygpath from run-make-support
ChrisDenton Aug 3, 2024
249afea
docs(resolve): more explain about `target`
bvanjoi Aug 4, 2024
69de294
tests: more crashes
matthiaskrgr Aug 4, 2024
249d686
rustdoc: Rename `SelfTy` to `ReceiverTy`
camelid Jul 31, 2024
664b3ff
rustdoc: Create `SelfTy` to replace `Generic(kw::SelfUpper)`
camelid Jul 31, 2024
4e348fa
rustdoc: Stop treating `Self` as a generic in search index
camelid Aug 1, 2024
e452e3d
Use `match` instead of sequence of `if let`s
camelid Aug 1, 2024
b4f77df
rustdoc: Delete `ReceiverTy` (formerly known as `SelfTy`)
camelid Aug 1, 2024
dac7f20
Add test for `Self` not being a generic in search index
camelid Aug 1, 2024
70ab51f
Correct the const stabilization of `<[T]>::last_chunk`
glandium Aug 3, 2024
02c3837
Rollup merge of #128026 - devnexen:available_parallelism_vxworks, r=M…
matthiaskrgr Aug 5, 2024
4adefa4
Rollup merge of #128471 - camelid:rustdoc-self, r=notriddle
matthiaskrgr Aug 5, 2024
f231973
Rollup merge of #128607 - ChrisDenton:visibility, r=jieyouxu
matthiaskrgr Aug 5, 2024
1e951b7
Rollup merge of #128609 - swenson:smaller-faster-dragon, r=Amanieu
matthiaskrgr Aug 5, 2024
baa00e5
Rollup merge of #128611 - ChrisDenton:cygpath, r=jieyouxu
matthiaskrgr Aug 5, 2024
74df517
Rollup merge of #128619 - glandium:last_chunk, r=scottmcm
matthiaskrgr Aug 5, 2024
227944d
Rollup merge of #128630 - bvanjoi:resolve-comment, r=petrochenkov
matthiaskrgr Aug 5, 2024
5fa740f
Rollup merge of #128660 - matthiaskrgr:niceice, r=compiler-errors
matthiaskrgr Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove cygpath from run-make-support
  • Loading branch information
@ChrisDenton
ChrisDenton committed Aug 4, 2024
commit f9d7e4c0a96f17a25e8246a22195ad86d796fb5d
4 changes: 1 addition & 3 deletions src/tools/run-make-support/src/external_deps/c_build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::path::PathBuf;

use super::cygpath::get_windows_path;
use crate::artifact_names::{dynamic_lib_name, static_lib_name};
use crate::external_deps::cc::{cc, cxx};
use crate::external_deps::llvm::llvm_ar;
Expand Down Expand Up @@ -44,8 +43,7 @@ pub fn build_native_dynamic_lib(lib_name: &str) -> PathBuf {
};
let obj_file = if is_msvc() { format!("{lib_name}.obj") } else { format!("{lib_name}.o") };
if is_msvc() {
let mut out_arg = "-out:".to_owned();
out_arg.push_str(&get_windows_path(&lib_path));
let out_arg = format!("-out:{lib_path}");
cc().input(&obj_file).args(&["-link", "-dll", &out_arg]).run();
} else if is_darwin() {
cc().out_exe(&lib_path).input(&obj_file).args(&["-dynamiclib", "-Wl,-dylib"]).run();
Expand Down
10 changes: 4 additions & 6 deletions src/tools/run-make-support/src/external_deps/cc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
use std::path::Path;

// FIXME(jieyouxu): can we get rid of the `cygpath` external dependency?
use super::cygpath::get_windows_path;
use crate::command::Command;
use crate::{env_var, is_msvc, is_windows, uname};

Expand Down Expand Up @@ -97,12 +95,12 @@ impl Cc {

if is_msvc() {
path.set_extension("exe");
let fe_path = get_windows_path(&path);
let fe_path = path.clone();
path.set_extension("");
path.set_extension("obj");
let fo_path = get_windows_path(path);
self.cmd.arg(format!("-Fe:{fe_path}"));
self.cmd.arg(format!("-Fo:{fo_path}"));
let fo_path = path;
self.cmd.arg(format!("-Fe:{}", fe_path.to_str().unwrap()));
self.cmd.arg(format!("-Fo:{}", fo_path.to_str().unwrap()));
} else {
self.cmd.arg("-o");
self.cmd.arg(name);
Expand Down
35 changes: 0 additions & 35 deletions src/tools/run-make-support/src/external_deps/cygpath.rs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/tools/run-make-support/src/external_deps/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,3 @@ pub mod llvm;
pub mod python;
pub mod rustc;
pub mod rustdoc;

// Library-internal external dependency.
mod cygpath;