Add `Duration::MAX` associated constant by marmeladema · Pull Request #72436 · rust-lang/rust

marmeladema · 2020-05-21T19:40:19Z

(To merge after #72434)

This change introduce Duration::MAX as associated constant on the same model as u64::MAX etc.

I re-used const_checked_int_methods feature gate to constify Duration::new, it might not be the best approach but i thought this PR would help start the discussion.

rust-highfive · 2020-05-21T19:40:22Z

r? @hanna-kruppe

(rust_highfive has picked a reviewer for you, use r? to override)

lcnr · 2020-05-21T19:43:32Z

src/libcore/time.rs

-    pub fn new(secs: u64, nanos: u32) -> Duration {
-        let secs =
-            secs.checked_add((nanos / NANOS_PER_SEC) as u64).expect("overflow in Duration::new");
+    #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]


Suggested change

#[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]

#[rustc_const_unstable(feature = "const_duration_new", issue = "53718")]

I don't think we should reuse const_checked_int_methods here.
You might have to add #![feature(const_duration_new)] to src/libcore/lib.rs so Duration::MAX can use this.

Also there should be a new tracking issue then.

rust-highfive · 2020-05-21T21:02:32Z

The job mingw-check of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

##[section]Starting: Linux mingw-check
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 70'
Agent machine name: 'fv-az578'
Current agent version: '2.168.2'
##[group]Operating System
16.04.6
LTS
LTS
##[endgroup]
##[group]Virtual Environment
Environment: ubuntu-16.04
Version: 20200512.2
Included Software: https://github.com/actions/virtual-environments/blob/ubuntu16/20200512.2/images/linux/Ubuntu1604-README.md
##[endgroup]
Agent running as: 'vsts'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.163.2)
Checking job knob settings.
   Knob: AgentToolsDirectory = /opt/hostedtoolcache Source: ${AGENT_TOOLSDIRECTORY} 
   Knob: AgentPerflog = /home/vsts/perflog Source: ${VSTS_AGENT_PERFLOG} 
Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/5422a39f-9b7d-4c40-855e-545baf999e8a.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/72436/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/72436/merge:refs/remotes/pull/72436/merge
---
 ---> 3adb0605cc65
Step 6/7 : ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
 ---> Using cache
 ---> 28dbc326cb7f
Step 7/7 : ENV SCRIPT python3 ../x.py test src/tools/expand-yaml-anchors &&            python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu &&            python3 ../x.py build --stage 0 src/tools/build-manifest &&            python3 ../x.py test --stage 0 src/tools/compiletest &&            python3 ../x.py test src/tools/tidy &&            python3 ../x.py doc --stage 0 src/libstd &&            /scripts/validate-toolstate.sh
 ---> 537a01811900
Successfully built 537a01811900
Successfully tagged rust-ci:latest
Built container sha256:537a018119009dc218456238dec90b5530050db1e2a1e166550c218003f6159d
---
    Checking rustc_feature v0.0.0 (/checkout/src/librustc_feature)
    Checking fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
    Checking rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
    Checking rustc_hir v0.0.0 (/checkout/src/librustc_hir)
    Checking rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
    Checking chalk-rust-ir v0.10.0
    Checking chalk-solve v0.10.0
    Checking rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
    Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
    Checking rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
---
configure: rust.codegen-units-std := 1
configure: rust.verify-llvm-ir  := True
configure: build.cargo-native-static := True
configure: llvm.assertions      := True
configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
configure: writing `config.toml` in current directory
configure: 
configure: run `python /checkout/x.py --help`
configure: 
---
Hugepagesize:       2048 kB
DirectMap4k:      137152 kB
DirectMap2M:     4057088 kB
DirectMap1G:     5242880 kB
+ python3 ../x.py test src/tools/expand-yaml-anchors
Ensuring the YAML anchors in the GitHub Actions config were expanded
Ensuring the YAML anchors in the GitHub Actions config were expanded
Building stage0 tool expand-yaml-anchors (x86_64-unknown-linux-gnu)
   Compiling unicode-xid v0.2.0
   Compiling syn v1.0.11
   Compiling linked-hash-map v0.5.2
   Compiling lazy_static v1.4.0
   Compiling lazy_static v1.4.0
   Compiling yaml-rust v0.4.3
   Compiling quote v1.0.2
   Compiling thiserror-impl v1.0.5
   Compiling thiserror v1.0.5
   Compiling yaml-merge-keys v0.4.0
   Compiling expand-yaml-anchors v0.1.0 (/checkout/src/tools/expand-yaml-anchors)
Build completed successfully in 0:00:32
+ python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu
    Finished dev [unoptimized] target(s) in 0.23s
Checking rustdoc artifacts (x86_64-unknown-linux-gnu -> i686-pc-windows-gnu)
---
    Checking rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
    Checking rustc_hir v0.0.0 (/checkout/src/librustc_hir)
    Checking chalk-rust-ir v0.10.0
    Checking rustc_session v0.0.0 (/checkout/src/librustc_session)
    Checking rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
    Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
    Checking rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
    Checking rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
    Checking rustc_ast_passes v0.0.0 (/checkout/src/librustc_ast_passes)
---
skip untracked path cpu-usage.csv during rustfmt invocations
skip untracked path src/doc/book/ during rustfmt invocations
skip untracked path src/doc/rust-by-example/ during rustfmt invocations
skip untracked path src/llvm-project/ during rustfmt invocations
Diff in /checkout/src/libcore/time.rs at line 121:
     /// assert_eq!(Duration::MAX, Duration::from_new(u64::MAX, 1_000_000_000-1));
     /// ```
     #[unstable(feature = "duration_constants", issue = "57391")]
-    pub const MAX: Duration = Duration::new(u64::MAX, NANOS_PER_SEC-1);
+    pub const MAX: Duration = Duration::new(u64::MAX, NANOS_PER_SEC - 1);
     /// Creates a new `Duration` from the specified number of whole seconds and
     /// additional nanoseconds.
     /// additional nanoseconds.
Running `"/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/rustfmt" "--config-path" "/checkout" "--edition" "2018" "--unstable-features" "--skip-children" "--check" "/checkout/src/libcore/time.rs"` failed.
If you're running `tidy`, try again with `--bless`. Or, if you just want to format code, run `./x.py fmt` instead.
Build completed unsuccessfully in 0:00:41
== clock drift check ==
  local time: Thu May 21 20:04:57 UTC 2020
  network time: Thu, 21 May 2020 20:04:57 GMT
  network time: Thu, 21 May 2020 20:04:57 GMT
== end clock drift check ==

##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/72436/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
Author       : Microsoft
Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/72436/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (3443) (python)
##[section]Finishing: Finalize Job

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

hanna-kruppe · 2020-05-22T09:59:30Z

r? @RalfJung

RalfJung · 2020-05-23T08:26:33Z

Not sure I can just approve new APIs like that.^^ Also, there is some overlap with #72481.

Cc @rust-lang/wg-const-eval

marmeladema · 2020-05-23T10:38:23Z

Let's close this in favor of #72481 even if it does not introduce Duration::MAX quite yet.

marmeladema added 2 commits May 21, 2020 20:22

Constify Duration::new

8d908b4

Add Duration::MAX associated constant

46fc0db

rust-highfive assigned hanna-kruppe May 21, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 21, 2020

lcnr reviewed May 21, 2020

View reviewed changes

RalfJung mentioned this pull request May 21, 2020

remove pointless rustc_const_stable attribute #72434

Closed

rust-highfive assigned RalfJung and unassigned hanna-kruppe May 22, 2020

RalfJung added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 23, 2020

marmeladema closed this May 23, 2020

marmeladema deleted the duration-new-const branch May 23, 2020 10:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add `Duration::MAX` associated constant#72436

Add `Duration::MAX` associated constant#72436
marmeladema wants to merge 2 commits intorust-lang:masterfrom
marmeladema:duration-new-const

marmeladema commented May 21, 2020

Uh oh!

rust-highfive commented May 21, 2020

Uh oh!

lcnr May 21, 2020

Uh oh!

RalfJung May 21, 2020

Uh oh!

rust-highfive commented May 21, 2020

Uh oh!

hanna-kruppe commented May 22, 2020

Uh oh!

RalfJung commented May 23, 2020

Uh oh!

marmeladema commented May 23, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	#[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
	#[rustc_const_unstable(feature = "const_duration_new", issue = "53718")]

Uh oh!

Conversation

marmeladema commented May 21, 2020

Uh oh!

rust-highfive commented May 21, 2020

Uh oh!

lcnr May 21, 2020

Choose a reason for hiding this comment

Uh oh!

RalfJung May 21, 2020

Choose a reason for hiding this comment

Uh oh!

rust-highfive commented May 21, 2020

Uh oh!

hanna-kruppe commented May 22, 2020

Uh oh!

RalfJung commented May 23, 2020

Uh oh!

marmeladema commented May 23, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants