mirror of
https://github.com/denoland/deno.git
synced 2024-12-25 00:29:09 -05:00
upgrade: Rust 1.49.0 (#8955)
This commit is contained in:
parent
88855b5d95
commit
41a4a34aee
5 changed files with 15 additions and 13 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -66,7 +66,7 @@ jobs:
|
||||||
- name: Install rust
|
- name: Install rust
|
||||||
uses: hecrj/setup-rust-action@v1
|
uses: hecrj/setup-rust-action@v1
|
||||||
with:
|
with:
|
||||||
rust-version: 1.48.0
|
rust-version: 1.49.0
|
||||||
|
|
||||||
- name: Install clippy and rustfmt
|
- name: Install clippy and rustfmt
|
||||||
if: matrix.kind == 'lint'
|
if: matrix.kind == 'lint'
|
||||||
|
|
|
@ -2300,10 +2300,11 @@ pub mod tests {
|
||||||
.expect("should have checked");
|
.expect("should have checked");
|
||||||
assert!(result_info.maybe_ignored_options.is_none());
|
assert!(result_info.maybe_ignored_options.is_none());
|
||||||
assert!(result_info.diagnostics.is_empty());
|
assert!(result_info.diagnostics.is_empty());
|
||||||
|
let (ver0, ver1) = {
|
||||||
let h = handler.lock().unwrap();
|
let h = handler.lock().unwrap();
|
||||||
assert_eq!(h.version_calls.len(), 2);
|
assert_eq!(h.version_calls.len(), 2);
|
||||||
let ver0 = h.version_calls[0].1.clone();
|
(h.version_calls[0].1.clone(), h.version_calls[1].1.clone())
|
||||||
let ver1 = h.version_calls[1].1.clone();
|
};
|
||||||
|
|
||||||
// let's do it all over again to ensure that the versions are determinstic
|
// let's do it all over again to ensure that the versions are determinstic
|
||||||
let (graph, handler) = setup(specifier).await;
|
let (graph, handler) = setup(specifier).await;
|
||||||
|
|
|
@ -107,10 +107,12 @@ impl ModuleLoader for EmbeddedModuleLoader {
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn run(source_code: String, args: Vec<String>) -> Result<(), AnyError> {
|
async fn run(source_code: String, args: Vec<String>) -> Result<(), AnyError> {
|
||||||
let mut flags = Flags::default();
|
let flags = Flags {
|
||||||
flags.argv = args[1..].to_vec();
|
argv: args[1..].to_vec(),
|
||||||
// TODO(lucacasonato): remove once you can specify this correctly through embedded metadata
|
// TODO(lucacasonato): remove once you can specify this correctly through embedded metadata
|
||||||
flags.unstable = true;
|
unstable: true,
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
let main_module = ModuleSpecifier::resolve_url(SPECIFIER)?;
|
let main_module = ModuleSpecifier::resolve_url(SPECIFIER)?;
|
||||||
let permissions = Permissions::allow_all();
|
let permissions = Permissions::allow_all();
|
||||||
let module_loader = Rc::new(EmbeddedModuleLoader(source_code));
|
let module_loader = Rc::new(EmbeddedModuleLoader(source_code));
|
||||||
|
|
|
@ -334,7 +334,7 @@ mod internal {
|
||||||
|
|
||||||
impl PartialEq for Node {
|
impl PartialEq for Node {
|
||||||
fn eq(&self, other: &Self) -> bool {
|
fn eq(&self, other: &Self) -> bool {
|
||||||
self as *const _ == other as *const _
|
std::ptr::eq(self, other)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1660,15 +1660,14 @@ async fn op_utime_async(
|
||||||
args: Value,
|
args: Value,
|
||||||
_zero_copy: BufVec,
|
_zero_copy: BufVec,
|
||||||
) -> Result<Value, AnyError> {
|
) -> Result<Value, AnyError> {
|
||||||
let state = state.borrow();
|
super::check_unstable(&state.borrow(), "Deno.utime");
|
||||||
super::check_unstable(&state, "Deno.utime");
|
|
||||||
|
|
||||||
let args: UtimeArgs = serde_json::from_value(args)?;
|
let args: UtimeArgs = serde_json::from_value(args)?;
|
||||||
let path = PathBuf::from(&args.path);
|
let path = PathBuf::from(&args.path);
|
||||||
let atime = filetime::FileTime::from_unix_time(args.atime.0, args.atime.1);
|
let atime = filetime::FileTime::from_unix_time(args.atime.0, args.atime.1);
|
||||||
let mtime = filetime::FileTime::from_unix_time(args.mtime.0, args.mtime.1);
|
let mtime = filetime::FileTime::from_unix_time(args.mtime.0, args.mtime.1);
|
||||||
|
|
||||||
state.borrow::<Permissions>().check_write(&path)?;
|
state.borrow().borrow::<Permissions>().check_write(&path)?;
|
||||||
|
|
||||||
tokio::task::spawn_blocking(move || {
|
tokio::task::spawn_blocking(move || {
|
||||||
filetime::set_file_times(path, atime, mtime)?;
|
filetime::set_file_times(path, atime, mtime)?;
|
||||||
|
|
Loading…
Reference in a new issue